commit a60a0ebbaec245af19fb54b1392c242f70e7d729
author lana <none@none> Mon Nov 21 18:48:19 2016 +0000
committer lana <none@none> Mon Nov 21 18:48:19 2016 +0000
tree 4bd2241c416a96e3694a3de17c88705a040bfd7c
parent 73394899b665ae521be0a4d8fc8cfa443a5f1614
parent 4c6715a81a3e30ff0adee74dcbc04dab0d3d04bb

Merge

test/Makefile

diff --git a/test/Makefile b/test/Makefile
index 00e2e86..6d6eb00 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -130,7 +130,8 @@
       -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
       -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
       -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
-      -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver
+      -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \
+      -timeoutHandlerTimeout:0
   ifeq ($(UNAME_S), CYGWIN)
     JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)"
   endif