# HG changeset patch
# User sla
# Date 1477295758 -7200
# Node ID e3e741af6407f4a54dbe19d89cda677cc48a1168
# Parent  c1e8e7815bf36e59c6c69d1cedb95f85b01999f9# Parent  b2f2a5b257f1e3a386704b361350ec1aef4d35ea
Merge

diff -r c1e8e7815bf3 -r e3e741af6407 hotspot/test/Makefile
--- 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