126 TESTNATIVE_DIR = $(TEST_IMAGE_DIR)
127 else ifdef JPRT_TESTNATIVE_PATH
128 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH)
129 endif
130 ifdef TESTNATIVE_DIR
131 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/jdk/jtreg/native")
132 endif
133
134 # jtreg failure handler config
135 ifeq ($(FAILURE_HANDLER_DIR), )
136 ifneq ($(TESTNATIVE_DIR), )
137 FAILURE_HANDLER_DIR := $(TESTNATIVE_DIR)/failure_handler
138 endif
139 endif
140 ifneq ($(FAILURE_HANDLER_DIR), )
141 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)")
142 JTREG_FAILURE_HANDLER_OPTIONS := \
143 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
144 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
145 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
146 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver
147 ifeq ($(UNAME_S), CYGWIN)
148 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)"
149 endif
150 endif
151
152 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
153 ifdef JPRT_ARCHIVE_BUNDLE
154 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
155 else
156 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
157 endif
158
159 # How to create the test bundle (pass or fail, we want to create this)
160 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed.
161 ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \
162 && $(CD) $(ABS_TEST_OUTPUT_DIR) \
163 && $(CHMOD) -R a+r . \
164 && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . )
165
166 # important results files
|
126 TESTNATIVE_DIR = $(TEST_IMAGE_DIR)
127 else ifdef JPRT_TESTNATIVE_PATH
128 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH)
129 endif
130 ifdef TESTNATIVE_DIR
131 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/jdk/jtreg/native")
132 endif
133
134 # jtreg failure handler config
135 ifeq ($(FAILURE_HANDLER_DIR), )
136 ifneq ($(TESTNATIVE_DIR), )
137 FAILURE_HANDLER_DIR := $(TESTNATIVE_DIR)/failure_handler
138 endif
139 endif
140 ifneq ($(FAILURE_HANDLER_DIR), )
141 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)")
142 JTREG_FAILURE_HANDLER_OPTIONS := \
143 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
144 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
145 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
146 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \
147 -timeoutHandlerTimeout:0
148 ifeq ($(UNAME_S), CYGWIN)
149 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)"
150 endif
151 endif
152
153 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
154 ifdef JPRT_ARCHIVE_BUNDLE
155 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
156 else
157 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
158 endif
159
160 # How to create the test bundle (pass or fail, we want to create this)
161 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed.
162 ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \
163 && $(CD) $(ABS_TEST_OUTPUT_DIR) \
164 && $(CHMOD) -R a+r . \
165 && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . )
166
167 # important results files
|