equal
deleted
inserted
replaced
141 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
141 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
142 JTREG_FAILURE_HANDLER_OPTIONS := \ |
142 JTREG_FAILURE_HANDLER_OPTIONS := \ |
143 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
143 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
144 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
144 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
145 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
145 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
146 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver |
146 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
|
147 -timeoutHandlerTimeout:0 |
147 ifeq ($(UNAME_S), CYGWIN) |
148 ifeq ($(UNAME_S), CYGWIN) |
148 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
149 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
149 endif |
150 endif |
150 endif |
151 endif |
151 |
152 |