471 ################################################################################ |
471 ################################################################################ |
472 # Generate test names for all JTReg test groups |
472 # Generate test names for all JTReg test groups |
473 # |
473 # |
474 |
474 |
475 define DeclareRunTestRecipe |
475 define DeclareRunTestRecipe |
476 run-test-$1: |
476 test-$1: |
477 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1") |
477 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1") |
478 |
478 |
479 exploded-run-test-$1: |
479 exploded-test-$1: |
480 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
480 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
481 TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
481 TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
482 |
482 |
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 run-test-, $(ALL_NAMED_TESTS)) |
487 ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS)) |
488 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-run-test-, $(ALL_NAMED_TESTS)) |
488 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_NAMED_TESTS)) |
489 |
489 |
490 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
490 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
491 |
491 |
492 ################################################################################ |
492 ################################################################################ |
493 # Build tests |
493 # Build tests |
517 build-test-hotspot-jtreg-graal) |
517 build-test-hotspot-jtreg-graal) |
518 |
518 |
519 test-image-hotspot-jtreg-graal: |
519 test-image-hotspot-jtreg-graal: |
520 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregGraalUnit.gmk \ |
520 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregGraalUnit.gmk \ |
521 test-image-hotspot-jtreg-graal) |
521 test-image-hotspot-jtreg-graal) |
522 |
|
523 run-test: |
|
524 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)") |
|
525 |
|
526 exploded-run-test: |
|
527 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
|
528 TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
|
529 |
522 |
530 ifeq ($(BUILD_GTEST), true) |
523 ifeq ($(BUILD_GTEST), true) |
531 test-image-hotspot-gtest: |
524 test-image-hotspot-gtest: |
532 +($(CD) $(TOPDIR)/make/hotspot/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk) |
525 +($(CD) $(TOPDIR)/make/hotspot/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk) |
533 endif |
526 endif |
539 # Builds the failure handler jtreg extension |
532 # Builds the failure handler jtreg extension |
540 build-test-failure-handler: |
533 build-test-failure-handler: |
541 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
534 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
542 -f BuildFailureHandler.gmk build) |
535 -f BuildFailureHandler.gmk build) |
543 |
536 |
544 # Runs the tests for the failure handler jtreg extension |
|
545 test-failure-handler: |
|
546 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
|
547 -f BuildFailureHandler.gmk test) |
|
548 |
|
549 # Copies the failure handler jtreg extension into the test image |
537 # Copies the failure handler jtreg extension into the test image |
550 test-image-failure-handler: |
538 test-image-failure-handler: |
551 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
539 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
552 -f BuildFailureHandler.gmk images) |
540 -f BuildFailureHandler.gmk images) |
553 endif |
541 endif |
554 |
542 |
555 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
543 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
556 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
544 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
557 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
545 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
558 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
546 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
559 test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal \ |
547 test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal |
560 run-test exploded-run-test |
|
561 |
548 |
562 ################################################################################ |
549 ################################################################################ |
563 # Run tests |
550 # Run tests |
564 |
551 |
565 # Run tests specified by $(TEST), or the default test set. |
|
566 test: |
552 test: |
567 $(call RunTests, $(TEST), $(JDK_IMAGE_DIR)) |
553 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)") |
568 |
554 |
569 test-hotspot-jtreg: |
555 exploded-test: |
570 $(call RunTests, "hotspot_all", $(JDK_IMAGE_DIR)) |
556 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
571 |
557 TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
572 test-hotspot-jtreg-native: |
558 |
573 $(call RunTests, "hotspot_native_sanity", $(JDK_IMAGE_DIR)) |
559 ALL_TARGETS += test exploded-test |
574 |
|
575 test-hotspot-internal: |
|
576 $(call RunTests, "hotspot_internal", $(JDK_OUTPUTDIR)) |
|
577 |
|
578 test-hotspot-gtest: |
|
579 $(call RunTests, "hotspot_gtest", $(JDK_OUTPUTDIR)) |
|
580 |
|
581 test-jdk-jtreg-native: |
|
582 $(call RunTests, "jdk_native_sanity", $(JDK_IMAGE_DIR)) |
|
583 |
|
584 test-make: |
|
585 ($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET)) |
|
586 |
|
587 test-compile-commands: |
|
588 ($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk test-compile-commands) |
|
589 |
|
590 ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \ |
|
591 test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make \ |
|
592 test-compile-commands |
|
593 |
560 |
594 ################################################################################ |
561 ################################################################################ |
595 # Bundles |
562 # Bundles |
596 |
563 |
597 product-bundles: |
564 product-bundles: |
872 |
839 |
873 docs-jdk-index: exploded-image buildtools-modules |
840 docs-jdk-index: exploded-image buildtools-modules |
874 |
841 |
875 docs-zip: docs-jdk |
842 docs-zip: docs-jdk |
876 |
843 |
|
844 # Tests |
877 test: jdk-image test-image |
845 test: jdk-image test-image |
878 |
846 |
879 run-test: jdk-image test-image |
847 exploded-test: exploded-image test-image |
880 exploded-run-test: exploded-image test-image |
848 |
|
849 test-make: clean-test-make compile-commands |
|
850 |
|
851 test-make-compile-commands: compile-commands |
881 |
852 |
882 # Declare dependency for all generated test targets |
853 # Declare dependency for all generated test targets |
883 $(foreach t, $(ALL_TEST_TARGETS), $(eval $t: jdk-image test-image)) |
854 $(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image)) |
884 $(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image)) |
855 $(foreach t, $(filter-out exploded-test-make%, $(ALL_EXPLODED_TEST_TARGETS)), $(eval $t: exploded-image test-image)) |
885 |
856 |
886 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
857 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
887 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
858 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
888 |
859 |
889 create-buildjdk-interim-image: create-buildjdk-copy |
860 create-buildjdk-interim-image: create-buildjdk-copy |
890 |
861 |
891 interim-image: $(INTERIM_JMOD_TARGETS) |
862 interim-image: $(INTERIM_JMOD_TARGETS) |
892 |
863 |
893 test-make: clean-test-make |
|
894 |
|
895 test-compile-commands: compile-commands |
|
896 |
|
897 build-test-lib: exploded-image-optimize |
864 build-test-lib: exploded-image-optimize |
898 |
865 |
899 build-test-failure-handler: interim-langtools |
866 build-test-failure-handler: interim-langtools |
900 |
|
901 test-failure-handler: build-test-failure-handler |
|
902 |
867 |
903 test-image-failure-handler: build-test-failure-handler |
868 test-image-failure-handler: build-test-failure-handler |
904 |
869 |
905 build-test-hotspot-jtreg-native: buildtools-jdk \ |
870 build-test-hotspot-jtreg-native: buildtools-jdk \ |
906 hotspot-$(JVM_VARIANT_MAIN)-libs |
871 hotspot-$(JVM_VARIANT_MAIN)-libs |
1088 docs: docs-image |
1047 docs: docs-image |
1089 bundles: all-bundles |
1048 bundles: all-bundles |
1090 all: all-images |
1049 all: all-images |
1091 |
1050 |
1092 ALL_TARGETS += default jdk images docs bundles all |
1051 ALL_TARGETS += default jdk images docs bundles all |
|
1052 |
|
1053 # Aliases used for running tests. |
|
1054 |
|
1055 # Let "run-test" be an alias for "test" |
|
1056 $(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)) |
|
1058 RUN_TEST_TARGETS := $(addprefix run-test-, $(ALL_NAMED_TESTS)) \ |
|
1059 $(addprefix exploded-run-test-, $(ALL_NAMED_TESTS)) |
|
1060 |
|
1061 run-test: test |
|
1062 exploded-run-test: exploded-test |
|
1063 |
|
1064 # "make check" is a common idiom for running basic testing |
|
1065 check: test-tier1 |
|
1066 |
|
1067 # Keep some old names as aliases |
|
1068 test-hotspot-jtreg: test-hotspot_all |
|
1069 test-hotspot-jtreg-native: test-hotspot_native_sanity |
|
1070 test-hotspot-gtest: exploded-test-gtest |
|
1071 test-jdk-jtreg-native: test-jdk_native_sanity |
|
1072 |
|
1073 ALL_TARGETS += $(RUN_TEST_TARGETS) run-test exploded-run-test check \ |
|
1074 test-hotspot-jtreg test-hotspot-jtreg-native test-hotspot-gtest \ |
|
1075 test-jdk-jtreg-native |
1093 |
1076 |
1094 ################################################################################ |
1077 ################################################################################ |
1095 ################################################################################ |
1078 ################################################################################ |
1096 # |
1079 # |
1097 # Clean targets |
1080 # Clean targets |