635 ))
636
637 $(eval $(call SetupTarget, test-image-jdk-jtreg-native, \
638 MAKEFILE := test/JtregNativeJdk, \
639 TARGET := test-image-jdk-jtreg-native, \
640 DEPS := build-test-jdk-jtreg-native, \
641 ))
642
643 $(eval $(call SetupTarget, build-test-hotspot-jtreg-graal, \
644 MAKEFILE := test/JtregGraalUnit, \
645 TARGET := build-test-hotspot-jtreg-graal, \
646 DEPS := exploded-image, \
647 ))
648
649 $(eval $(call SetupTarget, test-image-hotspot-jtreg-graal, \
650 MAKEFILE := test/JtregGraalUnit, \
651 TARGET := test-image-hotspot-jtreg-graal, \
652 DEPS := build-test-hotspot-jtreg-graal, \
653 ))
654
655 ifeq ($(BUILD_GTEST), true)
656 $(eval $(call SetupTarget, test-image-hotspot-gtest, \
657 MAKEFILE := hotspot/test/GtestImage, \
658 DEPS := hotspot, \
659 ))
660 endif
661
662 $(eval $(call SetupTarget, build-test-lib, \
663 MAKEFILE := test/BuildTestLib, \
664 DEPS := exploded-image, \
665 ))
666
667 ifeq ($(BUILD_FAILURE_HANDLER), true)
668 # Builds the failure handler jtreg extension
669 $(eval $(call SetupTarget, build-test-failure-handler, \
670 MAKEFILE := test/BuildFailureHandler, \
671 TARGET := build, \
672 DEPS := interim-langtools, \
673 ))
674
675 # Copies the failure handler jtreg extension into the test image
1092 endif
1093
1094 ifeq ($(call isTargetOs, macosx), true)
1095 product-images: mac-jdk-bundle
1096
1097 legacy-images: mac-legacy-jre-bundle
1098 endif
1099
1100 # This target builds the documentation image
1101 docs-image: docs-jdk
1102
1103 # This target builds the test image
1104 test-image: prepare-test-image test-image-jdk-jtreg-native test-image-demos-jdk
1105
1106 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
1107 # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the
1108 # standard hotspot set of tests.
1109 test-image: $(JVM_TEST_IMAGE_TARGETS)
1110 else
1111 test-image: test-image-hotspot-jtreg-native
1112 ifeq ($(BUILD_GTEST), true)
1113 test-image: test-image-hotspot-gtest
1114 endif
1115
1116 ifeq ($(INCLUDE_GRAAL), true)
1117 test-image: test-image-hotspot-jtreg-graal
1118 endif
1119 endif
1120
1121 ifeq ($(BUILD_FAILURE_HANDLER), true)
1122 test-image: test-image-failure-handler
1123 endif
1124
1125 ifneq ($(JMH_CORE_JAR), )
1126 test-image: build-microbenchmark
1127 endif
1128
1129 ################################################################################
1130
1131 # all-images builds all our deliverables as images.
1132 all-images: product-images test-image docs-image
|
635 ))
636
637 $(eval $(call SetupTarget, test-image-jdk-jtreg-native, \
638 MAKEFILE := test/JtregNativeJdk, \
639 TARGET := test-image-jdk-jtreg-native, \
640 DEPS := build-test-jdk-jtreg-native, \
641 ))
642
643 $(eval $(call SetupTarget, build-test-hotspot-jtreg-graal, \
644 MAKEFILE := test/JtregGraalUnit, \
645 TARGET := build-test-hotspot-jtreg-graal, \
646 DEPS := exploded-image, \
647 ))
648
649 $(eval $(call SetupTarget, test-image-hotspot-jtreg-graal, \
650 MAKEFILE := test/JtregGraalUnit, \
651 TARGET := test-image-hotspot-jtreg-graal, \
652 DEPS := build-test-hotspot-jtreg-graal, \
653 ))
654
655 ifneq ($GTEST_FRAMEWORK_SRC), )
656 $(eval $(call SetupTarget, test-image-hotspot-gtest, \
657 MAKEFILE := hotspot/test/GtestImage, \
658 DEPS := hotspot, \
659 ))
660 endif
661
662 $(eval $(call SetupTarget, build-test-lib, \
663 MAKEFILE := test/BuildTestLib, \
664 DEPS := exploded-image, \
665 ))
666
667 ifeq ($(BUILD_FAILURE_HANDLER), true)
668 # Builds the failure handler jtreg extension
669 $(eval $(call SetupTarget, build-test-failure-handler, \
670 MAKEFILE := test/BuildFailureHandler, \
671 TARGET := build, \
672 DEPS := interim-langtools, \
673 ))
674
675 # Copies the failure handler jtreg extension into the test image
1092 endif
1093
1094 ifeq ($(call isTargetOs, macosx), true)
1095 product-images: mac-jdk-bundle
1096
1097 legacy-images: mac-legacy-jre-bundle
1098 endif
1099
1100 # This target builds the documentation image
1101 docs-image: docs-jdk
1102
1103 # This target builds the test image
1104 test-image: prepare-test-image test-image-jdk-jtreg-native test-image-demos-jdk
1105
1106 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
1107 # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the
1108 # standard hotspot set of tests.
1109 test-image: $(JVM_TEST_IMAGE_TARGETS)
1110 else
1111 test-image: test-image-hotspot-jtreg-native
1112 ifneq ($(GTEST_FRAMEWORK_SRC), )
1113 test-image: test-image-hotspot-gtest
1114 endif
1115
1116 ifeq ($(INCLUDE_GRAAL), true)
1117 test-image: test-image-hotspot-jtreg-graal
1118 endif
1119 endif
1120
1121 ifeq ($(BUILD_FAILURE_HANDLER), true)
1122 test-image: test-image-failure-handler
1123 endif
1124
1125 ifneq ($(JMH_CORE_JAR), )
1126 test-image: build-microbenchmark
1127 endif
1128
1129 ################################################################################
1130
1131 # all-images builds all our deliverables as images.
1132 all-images: product-images test-image docs-image
|