# HG changeset patch
# User jwilhelm
# Date 1478695041 -3600
# Node ID 12466052bcb76a02bd1852556d01039daad66eee
# Parent  31f5023200d42185b70c4c00ba5672391e4642d0# Parent  5cecf1898b8db9c6783be98f722367f3a6555fd8
Merge

diff -r 31f5023200d4 -r 12466052bcb7 nashorn/test/Makefile
--- 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