equal
deleted
inserted
replaced
128 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
128 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)") |
129 JTREG_FAILURE_HANDLER_OPTIONS := \ |
129 JTREG_FAILURE_HANDLER_OPTIONS := \ |
130 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
130 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
131 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
131 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \ |
132 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
132 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ |
133 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver |
133 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ |
|
134 -timeoutHandlerTimeout:0 |
134 ifeq ($(UNAME_S), CYGWIN) |
135 ifeq ($(UNAME_S), CYGWIN) |
135 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
136 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)" |
136 endif |
137 endif |
137 endif |
138 endif |
138 |
139 |