Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorjwilhelm
Wed, 09 Nov 2016 13:37:21 +0100
changeset 42787 12466052bcb7
parent 41945 31f5023200d4 (current diff)
parent 42114 5cecf1898b8d (diff)
child 42788 f3a80f264a96
child 42793 39afd5493723
Merge
--- a/nashorn/test/Makefile	Wed Jul 05 22:26:06 2017 +0200
+++ b/nashorn/test/Makefile	Wed Nov 09 13:37:21 2016 +0100
@@ -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
jdk-sandbox