96 endif |
96 endif |
97 |
97 |
98 JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler |
98 JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler |
99 JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar |
99 JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar |
100 |
100 |
|
101 JTREG_FAILURE_HANDLER_TIMEOUT ?= 0 |
|
102 |
101 ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) |
103 ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) |
102 JTREG_FAILURE_HANDLER_OPTIONS := \ |
104 JTREG_FAILURE_HANDLER_OPTIONS := \ |
103 -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ |
105 -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ |
104 -observerDir:$(JTREG_FAILURE_HANDLER) \ |
106 -observerDir:$(JTREG_FAILURE_HANDLER) \ |
105 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
107 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
106 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
108 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
107 -timeoutHandlerTimeout:0 |
109 -timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT) |
108 endif |
110 endif |
109 |
111 |
110 GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \ |
112 GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \ |
111 $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher)) |
113 $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher)) |
112 GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \ |
114 GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \ |
274 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG)) |
276 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG)) |
275 $(eval $(call SetTestOpt,AOT_MODULES,JTREG)) |
277 $(eval $(call SetTestOpt,AOT_MODULES,JTREG)) |
276 |
278 |
277 $(eval $(call SetTestOpt,JOBS,JTREG)) |
279 $(eval $(call SetTestOpt,JOBS,JTREG)) |
278 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) |
280 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) |
|
281 $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG)) |
279 |
282 |
280 $(eval $(call ParseKeywordVariable, JTREG, \ |
283 $(eval $(call ParseKeywordVariable, JTREG, \ |
281 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN \ |
284 SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ |
282 MAX_MEM RUN_PROBLEM_LISTS, \ |
285 TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS, \ |
283 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ |
286 STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ |
284 EXTRA_PROBLEM_LISTS AOT_MODULES, \ |
287 EXTRA_PROBLEM_LISTS AOT_MODULES, \ |
285 )) |
288 )) |
286 |
289 |
287 ifneq ($(JTREG), ) |
290 ifneq ($(JTREG), ) |