Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1841:937852b4c102
Merge
author | jwilhelm |
---|---|
date | Wed, 09 Nov 2016 13:37:21 +0100 |
parents | a7f21ee6ed30 (current diff) 1e7049278c4c (diff) |
children | 542563e5eeae 6d9a55b33ef0 |
files | |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/test/Makefile Mon Nov 07 14:48:26 2016 +0100 +++ b/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