OpenJDK / jdk / jdk
changeset 56230:6488adc963b8
8230781: Add JTREG_FAILURE_HANDLER_TIMEOUT to control timeout handler timeout
Reviewed-by: erikj
| author | lmesnik |
|---|---|
| date | Tue, 10 Sep 2019 09:12:08 -0700 |
| parents | 6eca527d3689 |
| children | 874edfe72c3e |
| files | make/RunTests.gmk |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/RunTests.gmk Tue Sep 10 09:08:52 2019 -0700 +++ b/make/RunTests.gmk Tue Sep 10 09:12:08 2019 -0700 @@ -98,13 +98,15 @@ JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar +JTREG_FAILURE_HANDLER_TIMEOUT ?= 0 + ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) JTREG_FAILURE_HANDLER_OPTIONS := \ -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ -observerDir:$(JTREG_FAILURE_HANDLER) \ -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ - -timeoutHandlerTimeout:0 + -timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT) endif GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \ @@ -276,10 +278,11 @@ $(eval $(call SetTestOpt,JOBS,JTREG)) $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) +$(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG)) $(eval $(call ParseKeywordVariable, JTREG, \ - SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN \ - MAX_MEM RUN_PROBLEM_LISTS, \ + SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ + TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS, \ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ EXTRA_PROBLEM_LISTS AOT_MODULES, \ ))