diff --git a/make/RunTests.gmk b/make/RunTests.gmk index 39c82706977..b2260c75b08 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -98,13 +98,15 @@ endif 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,AOT_MODULES,JTREG)) $(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, \ ))