178 TESTNATIVE_DIR = $(TEST_IMAGE_DIR)
179 else ifdef JPRT_TESTNATIVE_PATH
180 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH)
181 endif
182 ifdef TESTNATIVE_DIR
183 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/hotspot/jtreg/native")
184 endif
185
186 # jtreg failure handler config
187 ifeq ($(FAILURE_HANDLER_DIR), )
188 ifneq ($(TESTNATIVE_DIR), )
189 FAILURE_HANDLER_DIR := $(TESTNATIVE_DIR)/failure_handler
190 endif
191 endif
192 ifneq ($(FAILURE_HANDLER_DIR), )
193 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)")
194 JTREG_FAILURE_HANDLER_OPTIONS := \
195 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
196 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
197 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
198 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver
199 ifeq ($(PLATFORM), windows)
200 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)"
201 endif
202 endif
203
204 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
205 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
206 ifdef JPRT_ARCHIVE_BUNDLE
207 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
208 endif
209
210 # How to create the test bundle (pass or fail, we want to create this)
211 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed.
212 ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \
213 && $(CD) $(ABS_TEST_OUTPUT_DIR) \
214 && $(CHMOD) -R a+r . \
215 && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . )
216
217 # important results files
218 SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt")
|
178 TESTNATIVE_DIR = $(TEST_IMAGE_DIR)
179 else ifdef JPRT_TESTNATIVE_PATH
180 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH)
181 endif
182 ifdef TESTNATIVE_DIR
183 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/hotspot/jtreg/native")
184 endif
185
186 # jtreg failure handler config
187 ifeq ($(FAILURE_HANDLER_DIR), )
188 ifneq ($(TESTNATIVE_DIR), )
189 FAILURE_HANDLER_DIR := $(TESTNATIVE_DIR)/failure_handler
190 endif
191 endif
192 ifneq ($(FAILURE_HANDLER_DIR), )
193 FAILURE_HANDLER_DIR_MIXED := $(shell $(GETMIXEDPATH) "$(FAILURE_HANDLER_DIR)")
194 JTREG_FAILURE_HANDLER_OPTIONS := \
195 -timeoutHandlerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
196 -observerDir:$(FAILURE_HANDLER_DIR_MIXED)/jtregFailureHandler.jar \
197 -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
198 -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \
199 -timeoutHandlerTimeout:0
200 ifeq ($(PLATFORM), windows)
201 JTREG_FAILURE_HANDLER_OPTIONS += -J-Djava.library.path="$(FAILURE_HANDLER_DIR_MIXED)"
202 endif
203 endif
204
205 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
206 ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
207 ifdef JPRT_ARCHIVE_BUNDLE
208 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
209 endif
210
211 # How to create the test bundle (pass or fail, we want to create this)
212 # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed.
213 ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \
214 && $(CD) $(ABS_TEST_OUTPUT_DIR) \
215 && $(CHMOD) -R a+r . \
216 && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . )
217
218 # important results files
219 SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt")
|