stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8197906: Enable CDS mode execution of jtreg tests via make

Browse Source 
Changed make file to add this functionality

Reviewed-by: iignatyev, ihse
This commit is contained in:
Erik Joelsson 2018-02-15 13:37:50 -08:00 committed by Mikhailo Seledtsov
parent a74437edc9
commit e27aca5e99
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/TestCommon.gmk
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -173,6 +173,20 @@ ifeq ($(USE_FAILURE_HANDLER), true)
endif
endif
# Optionally create a CDS archive before running tests
ifeq ($(GENERATE_CDS_ARCHIVE), true)
CDS_ARCHIVE_FILE := $(ABS_TEST_OUTPUT_DIR)/cds_archive.jsa
$(CDS_ARCHIVE_FILE): $(PRODUCT_HOME)
$(PRODUCT_HOME)/bin/java -XX:+UnlockDiagnosticVMOptions \
-XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)") -Xshare:dump
CDS_VM_ARGS := -XX:+UnlockDiagnosticVMOptions -XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)")
JTREG_TEST_OPTIONS += $(addprefix -vmoption:, $(CDS_VM_ARGS))
TEST_PREREQS += $(CDS_ARCHIVE_FILE)
endif
# Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
ifdef JPRT_ARCHIVE_BUNDLE
ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
@ -444,7 +458,7 @@ endif
PHONY_LIST += jtreg_exists
# Run jtreg
jtreg_tests: prep jtreg_exists $(PRODUCT_HOME)
jtreg_tests: prep jtreg_exists $(PRODUCT_HOME) $(TEST_PREREQS)
( \
( JT_HOME=$(shell $(GETMIXEDPATH) "$(JT_HOME)"); \
export JT_HOME; \