477 # Generate test names for all JTReg test groups |
477 # Generate test names for all JTReg test groups |
478 # |
478 # |
479 |
479 |
480 define DeclareRunTestRecipe |
480 define DeclareRunTestRecipe |
481 test-$1: |
481 test-$1: |
482 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1") |
482 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \ |
|
483 TEST="$1") |
483 |
484 |
484 exploded-test-$1: |
485 exploded-test-$1: |
485 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
486 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \ |
486 TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
487 TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
487 endef |
488 endef |
488 |
489 |
489 # ALL_NAMED_TESTS is defined in FindTests.gmk |
490 # ALL_NAMED_TESTS is defined in FindTests.gmk |
490 $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t))) |
491 $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t))) |
491 ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS)) |
492 ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS)) |
492 |
493 |
493 define DeclareRunJCovTestRecipe |
|
494 jcov-test-$1: |
|
495 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \ |
|
496 TEST="$1" TEST_OPTS_JCOV=true) |
|
497 endef |
|
498 |
|
499 # jcov-test only makes sense for some of the tests |
|
500 $(foreach t, $(JCOV_NAMED_TESTS), $(eval $(call DeclareRunJCovTestRecipe,$t))) |
|
501 ALL_JCOV_TEST_TARGETS := $(addprefix jcov-test-, $(JCOV_NAMED_TESTS)) |
|
502 |
|
503 # We only support the "exploded-test-gtest" shortcut |
494 # We only support the "exploded-test-gtest" shortcut |
504 ALL_EXPLODED_TESTS := gtest |
495 ALL_EXPLODED_TESTS := gtest |
505 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS)) |
496 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS)) |
506 |
497 |
507 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) $(ALL_JCOV_TEST_TARGETS) |
498 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
508 |
499 |
509 ################################################################################ |
500 ################################################################################ |
510 # Build tests and microbenchmarks |
501 # Build tests and microbenchmarks |
511 # |
502 # |
512 |
503 |
569 |
560 |
570 ################################################################################ |
561 ################################################################################ |
571 # Run tests |
562 # Run tests |
572 |
563 |
573 test: |
564 test: |
574 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)") |
565 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \ |
|
566 TEST="$(TEST)") |
575 |
567 |
576 exploded-test: |
568 exploded-test: |
577 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
569 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \ |
578 TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
570 TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
579 |
571 |
580 jcov-test: |
572 jcov-test: |
581 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \ |
573 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \ |
582 TEST="$(TEST)" TEST_OPTS_JCOV=true) |
574 TEST="$(TEST)" TEST_OPTS_JCOV=true) |
889 test-make-compile-commands: compile-commands |
881 test-make-compile-commands: compile-commands |
890 |
882 |
891 # Declare dependency for all generated test targets |
883 # Declare dependency for all generated test targets |
892 $(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image)) |
884 $(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image)) |
893 $(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image)) |
885 $(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image)) |
894 $(ALL_JCOV_TEST_TARGETS): jcov-image test-image |
|
895 |
886 |
896 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
887 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
897 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
888 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
898 |
889 |
899 create-buildjdk-interim-image: create-buildjdk-copy |
890 create-buildjdk-interim-image: create-buildjdk-copy |