121 else ifdef JPRT_TESTNATIVE_PATH |
121 else ifdef JPRT_TESTNATIVE_PATH |
122 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH) |
122 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH) |
123 endif |
123 endif |
124 ifdef TESTNATIVE_DIR |
124 ifdef TESTNATIVE_DIR |
125 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/jdk/jtreg/native") |
125 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/jdk/jtreg/native") |
|
126 endif |
|
127 |
|
128 # jtreg failure handler config |
|
129 ifeq ($(FAILURE_HANDLER_DIR), ) |
|
130 ifneq ($(TESTNATIVE_DIR), ) |
|
131 FAILURE_HANDLER_DIR := $(TESTNATIVE_DIR)/failure_handler |
|
132 endif |
|
133 endif |
|
134 ifneq ($(FAILURE_HANDLER_DIR), ) |
|
135 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
|
136 JTREG_FAILURE_HANDLER_OPTIONS := \ |
|
137 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
|
138 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
|
139 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
|
140 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver |
|
141 ifeq ($(UNAME_S), CYGWIN) |
|
142 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
|
143 endif |
126 endif |
144 endif |
127 |
145 |
128 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
146 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
129 ifdef JPRT_ARCHIVE_BUNDLE |
147 ifdef JPRT_ARCHIVE_BUNDLE |
130 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) |
148 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) |
327 $(JTREG_BASIC_OPTIONS) \ |
345 $(JTREG_BASIC_OPTIONS) \ |
328 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ |
346 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ |
329 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ |
347 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ |
330 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
348 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
331 $(JTREG_NATIVE_PATH) \ |
349 $(JTREG_NATIVE_PATH) \ |
|
350 $(JTREG_FAILURE_HANDLER_OPTIONS) \ |
332 $(JTREG_EXCLUSIONS) \ |
351 $(JTREG_EXCLUSIONS) \ |
333 $(JTREG_TEST_OPTIONS) \ |
352 $(JTREG_TEST_OPTIONS) \ |
334 $(TEST_SELECTION) \ |
353 $(TEST_SELECTION) \ |
335 ) ; \ |
354 ) ; \ |
336 $(BUNDLE_UP_AND_EXIT) \ |
355 $(BUNDLE_UP_AND_EXIT) \ |