equal
deleted
inserted
replaced
483 endef |
483 endef |
484 |
484 |
485 # ALL_NAMED_TESTS is defined in FindTests.gmk |
485 # ALL_NAMED_TESTS is defined in FindTests.gmk |
486 $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t))) |
486 $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t))) |
487 ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS)) |
487 ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS)) |
488 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_NAMED_TESTS)) |
488 |
|
489 # We only support the "exploded-test-gtest" shortcut |
|
490 ALL_EXPLODED_TESTS := gtest |
|
491 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS)) |
489 |
492 |
490 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
493 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
491 |
494 |
492 ################################################################################ |
495 ################################################################################ |
493 # Build tests |
496 # Build tests |
850 |
853 |
851 test-make-compile-commands: compile-commands |
854 test-make-compile-commands: compile-commands |
852 |
855 |
853 # Declare dependency for all generated test targets |
856 # Declare dependency for all generated test targets |
854 $(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image)) |
857 $(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image)) |
855 $(foreach t, $(filter-out exploded-test-make%, $(ALL_EXPLODED_TEST_TARGETS)), $(eval $t: exploded-image test-image)) |
858 $(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image)) |
856 |
859 |
857 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
860 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
858 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
861 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
859 |
862 |
860 create-buildjdk-interim-image: create-buildjdk-copy |
863 create-buildjdk-interim-image: create-buildjdk-copy |
1052 |
1055 |
1053 # Aliases used for running tests. |
1056 # Aliases used for running tests. |
1054 |
1057 |
1055 # Let "run-test" be an alias for "test" |
1058 # Let "run-test" be an alias for "test" |
1056 $(foreach t, $(ALL_NAMED_TESTS), $(eval run-test-$t: test-$t)) |
1059 $(foreach t, $(ALL_NAMED_TESTS), $(eval run-test-$t: test-$t)) |
1057 $(foreach t, $(ALL_NAMED_TESTS), $(eval exploded-run-test-$t: exploded-test-$t)) |
1060 RUN_TEST_TARGETS := $(addprefix run-test-, $(ALL_NAMED_TESTS)) |
1058 RUN_TEST_TARGETS := $(addprefix run-test-, $(ALL_NAMED_TESTS)) \ |
|
1059 $(addprefix exploded-run-test-, $(ALL_NAMED_TESTS)) |
|
1060 |
1061 |
1061 run-test: test |
1062 run-test: test |
1062 exploded-run-test: exploded-test |
1063 exploded-run-test: exploded-test |
1063 |
1064 |
1064 # "make check" is a common idiom for running basic testing |
1065 # "make check" is a common idiom for running basic testing |