OpenJDK / jdk / jdk
changeset 42115:0a25cf6b2f8d
Merge
| author | jwilhelm |
|---|---|
| date | Wed, 09 Nov 2016 13:37:21 +0100 |
| parents | 3ee4e7827413 5cecf1898b8d |
| children | e9aa3423c897 7ac7543bdd5e |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/nashorn/test/Makefile Wed Jul 05 22:27:20 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