equal
deleted
inserted
replaced
174 -timeoutHandlerTimeout:0 |
174 -timeoutHandlerTimeout:0 |
175 ifeq ($(PLATFORM), windows) |
175 ifeq ($(PLATFORM), windows) |
176 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
176 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
177 endif |
177 endif |
178 endif |
178 endif |
179 endif |
|
180 |
|
181 |
|
182 # Optionally create a CDS archive before running tests |
|
183 ifeq ($(GENERATE_CDS_ARCHIVE), true) |
|
184 CDS_ARCHIVE_FILE := $(ABS_TEST_OUTPUT_DIR)/cds_archive.jsa |
|
185 |
|
186 $(CDS_ARCHIVE_FILE): $(PRODUCT_HOME) |
|
187 $(PRODUCT_HOME)/bin/java -XX:+UnlockDiagnosticVMOptions \ |
|
188 -XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)") -Xshare:dump |
|
189 |
|
190 CDS_VM_ARGS := -XX:+UnlockDiagnosticVMOptions -XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)") |
|
191 JTREG_TEST_OPTIONS += $(addprefix -vmoption:, $(CDS_VM_ARGS)) |
|
192 TEST_PREREQS += $(CDS_ARCHIVE_FILE) |
|
193 endif |
179 endif |
194 |
180 |
195 # How to create the test bundle (pass or fail, we want to create this) |
181 # How to create the test bundle (pass or fail, we want to create this) |
196 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. |
182 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. |
197 ifneq ($(ARCHIVE_BUNDLE), ) |
183 ifneq ($(ARCHIVE_BUNDLE), ) |