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
authorsla
Mon, 24 Oct 2016 09:55:58 +0200
changeset 42046 e3e741af6407
parent 42044 c1e8e7815bf3 (current diff)
parent 42045 b2f2a5b257f1 (diff)
child 42047 72bc0277f889
child 42048 c1f066b53dd7
Merge
--- a/hotspot/test/Makefile	Thu Oct 06 18:04:11 2016 +0200
+++ b/hotspot/test/Makefile	Mon Oct 24 09:55:58 2016 +0200
@@ -195,7 +195,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 ($(PLATFORM), windows)
     JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)"
   endif
jdk-sandbox