155 else ifdef JPRT_TESTNATIVE_PATH |
155 else ifdef JPRT_TESTNATIVE_PATH |
156 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH) |
156 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH) |
157 endif |
157 endif |
158 ifdef TESTNATIVE_DIR |
158 ifdef TESTNATIVE_DIR |
159 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/hotspot/jtreg/native") |
159 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/hotspot/jtreg/native") |
|
160 endif |
|
161 |
|
162 # jtreg failure handler config |
|
163 ifeq ($(FAILURE_HANDLER_DIR), ) |
|
164 ifneq ($(TESTNATIVE_DIR), ) |
|
165 FAILURE_HANDLER_DIR := $(TESTNATIVE_DIR)/failure_handler |
|
166 endif |
|
167 endif |
|
168 ifneq ($(FAILURE_HANDLER_DIR), ) |
|
169 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
|
170 JTREG_FAILURE_HANDLER_OPTIONS := \ |
|
171 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
|
172 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
|
173 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
|
174 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver |
|
175 ifeq ($(PLATFORM), windows) |
|
176 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
|
177 endif |
160 endif |
178 endif |
161 |
179 |
162 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
180 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
163 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip |
181 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip |
164 ifdef JPRT_ARCHIVE_BUNDLE |
182 ifdef JPRT_ARCHIVE_BUNDLE |
320 $(JTREG_BASIC_OPTIONS) \ |
338 $(JTREG_BASIC_OPTIONS) \ |
321 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ |
339 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ |
322 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ |
340 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ |
323 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
341 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
324 $(JTREG_NATIVE_PATH) \ |
342 $(JTREG_NATIVE_PATH) \ |
|
343 $(JTREG_FAILURE_HANDLER_OPTIONS) \ |
325 $(JTREG_EXCLUSIONS) \ |
344 $(JTREG_EXCLUSIONS) \ |
326 $(JTREG_TEST_OPTIONS) \ |
345 $(JTREG_TEST_OPTIONS) \ |
327 $(TEST_SELECTION) \ |
346 $(TEST_SELECTION) \ |
328 ) ; \ |
347 ) ; \ |
329 $(BUNDLE_UP_AND_EXIT) \ |
348 $(BUNDLE_UP_AND_EXIT) \ |