equal
deleted
inserted
replaced
193 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
193 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
194 JTREG_FAILURE_HANDLER_OPTIONS := \ |
194 JTREG_FAILURE_HANDLER_OPTIONS := \ |
195 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
195 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
196 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
196 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
197 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
197 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
198 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver |
198 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
|
199 -timeoutHandlerTimeout:0 |
199 ifeq ($(PLATFORM), windows) |
200 ifeq ($(PLATFORM), windows) |
200 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
201 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
201 endif |
202 endif |
202 endif |
203 endif |
203 |
204 |