8149777: Enable enhanced failure handler for "make test"
Reviewed-by: ihse
This commit is contained in:
parent
07b96dfbd1
commit
0319d95579
@ -125,6 +125,24 @@ ifdef TESTNATIVE_DIR
|
|||||||
JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/jdk/jtreg/native")
|
JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/jdk/jtreg/native")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# jtreg failure handler config
|
||||||
|
ifeq ($(FAILURE_HANDLER_DIR), )
|
||||||
|
ifneq ($(TESTNATIVE_DIR), )
|
||||||
|
FAILURE_HANDLER_DIR := $(TESTNATIVE_DIR)/failure_handler
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifneq ($(FAILURE_HANDLER_DIR), )
|
||||||
|
FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)")
|
||||||
|
JTREG_FAILURE_HANDLER_OPTIONS := \
|
||||||
|
-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
|
||||||
|
ifeq ($(UNAME_S), CYGWIN)
|
||||||
|
JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)"
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
# Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
|
# Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
|
||||||
ifdef JPRT_ARCHIVE_BUNDLE
|
ifdef JPRT_ARCHIVE_BUNDLE
|
||||||
ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
|
ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
|
||||||
@ -329,6 +347,7 @@ jtreg_tests: prep $(PRODUCT_HOME) $(JTREG)
|
|||||||
-w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \
|
-w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \
|
||||||
-jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \
|
-jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \
|
||||||
$(JTREG_NATIVE_PATH) \
|
$(JTREG_NATIVE_PATH) \
|
||||||
|
$(JTREG_FAILURE_HANDLER_OPTIONS) \
|
||||||
$(JTREG_EXCLUSIONS) \
|
$(JTREG_EXCLUSIONS) \
|
||||||
$(JTREG_TEST_OPTIONS) \
|
$(JTREG_TEST_OPTIONS) \
|
||||||
$(TEST_SELECTION) \
|
$(TEST_SELECTION) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user