263 |
263 |
264 SetupRunGtestTest = $(NamedParamsMacroTemplate) |
264 SetupRunGtestTest = $(NamedParamsMacroTemplate) |
265 define SetupRunGtestTestBody |
265 define SetupRunGtestTestBody |
266 $1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
266 $1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
267 $1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
267 $1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
|
268 $1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
268 |
269 |
269 $1_TEST_NAME := $$(strip $$(patsubst gtest:%, %, $$($1_TEST))) |
270 $1_TEST_NAME := $$(strip $$(patsubst gtest:%, %, $$($1_TEST))) |
270 ifneq ($$($1_TEST_NAME), all) |
271 ifneq ($$($1_TEST_NAME), all) |
271 $1_GTEST_FILTER := --gtest_filter=$$($1_TEST_NAME)* |
272 $1_GTEST_FILTER := --gtest_filter=$$($1_TEST_NAME)* |
272 endif |
273 endif |
279 $$(call LogWarn) |
280 $$(call LogWarn) |
280 $$(call LogWarn, Running test '$$($1_TEST)') |
281 $$(call LogWarn, Running test '$$($1_TEST)') |
281 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
282 $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) |
282 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \ |
283 $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \ |
283 $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/server/gtestLauncher \ |
284 $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/server/gtestLauncher \ |
284 -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \ |
285 -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \ |
285 --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ |
286 --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ |
286 $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) \ |
287 $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) \ |
287 > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) ; \ |
288 > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) && \ |
288 $$(ECHO) $$$$? > $$($1_TEST_RESULTS_DIR)/exitcode.txt ) |
289 $$(ECHO) $$$$? > $$($1_EXITCODE) || |
|
290 $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
291 ) |
289 |
292 |
290 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
293 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt |
291 |
294 |
292 parse-test-$1: run-test-$1 |
295 parse-test-$1: run-test-$1 |
293 $$(call LogWarn, Finished running test '$$($1_TEST)') |
296 $$(call LogWarn, Finished running test '$$($1_TEST)') |
337 |
340 |
338 SetupRunJtregTest = $(NamedParamsMacroTemplate) |
341 SetupRunJtregTest = $(NamedParamsMacroTemplate) |
339 define SetupRunJtregTestBody |
342 define SetupRunJtregTestBody |
340 $1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
343 $1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1 |
341 $1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
344 $1_TEST_SUPPORT_DIR := $$(TEST_SUPPORT_DIR)/$1 |
|
345 $1_EXITCODE := $$($1_TEST_RESULTS_DIR)/exitcode.txt |
342 |
346 |
343 $1_TEST_NAME := $$(strip $$(patsubst jtreg:%, %, $$($1_TEST))) |
347 $1_TEST_NAME := $$(strip $$(patsubst jtreg:%, %, $$($1_TEST))) |
344 |
348 |
345 $1_COMPONENT := \ |
349 $1_COMPONENT := \ |
346 $$(strip $$(foreach root, $$(JTREG_TESTROOTS), \ |
350 $$(strip $$(foreach root, $$(JTREG_TESTROOTS), \ |
439 -testjdk:$$(JDK_IMAGE_DIR) \ |
443 -testjdk:$$(JDK_IMAGE_DIR) \ |
440 -dir:$$(JTREG_TOPDIR) \ |
444 -dir:$$(JTREG_TOPDIR) \ |
441 -reportDir:$$($1_TEST_RESULTS_DIR) \ |
445 -reportDir:$$($1_TEST_RESULTS_DIR) \ |
442 -workDir:$$($1_TEST_SUPPORT_DIR) \ |
446 -workDir:$$($1_TEST_SUPPORT_DIR) \ |
443 $$(JTREG_OPTIONS) \ |
447 $$(JTREG_OPTIONS) \ |
444 $$($1_TEST_NAME) ; \ |
448 $$($1_TEST_NAME) && \ |
445 $$(ECHO) $$$$? > $$($1_TEST_RESULTS_DIR)/exitcode.txt ) |
449 $$(ECHO) $$$$? > $$($1_EXITCODE) || |
|
450 $$(ECHO) $$$$? > $$($1_EXITCODE) \ |
|
451 ) |
446 |
452 |
447 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt |
453 $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt |
448 |
454 |
449 parse-test-$1: run-test-$1 |
455 parse-test-$1: run-test-$1 |
450 $$(call LogWarn, Finished running test '$$($1_TEST)') |
456 $$(call LogWarn, Finished running test '$$($1_TEST)') |