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
authorlana
Mon, 21 Nov 2016 18:48:19 +0000
changeset 42116 e9aa3423c897
parent 42115 0a25cf6b2f8d (diff)
parent 42113 d3b3593acddf (current diff)
child 42117 bb008c808efd
Merge
--- a/nashorn/test/Makefile	Thu Nov 17 17:50:09 2016 +0000
+++ b/nashorn/test/Makefile	Mon Nov 21 18:48:19 2016 +0000
@@ -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