equal
deleted
inserted
replaced
491 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS)) |
491 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS)) |
492 |
492 |
493 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
493 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
494 |
494 |
495 ################################################################################ |
495 ################################################################################ |
496 # Build tests |
496 # Build tests and microbenchmarks |
497 # |
497 # |
498 |
498 |
499 prepare-test-image: |
499 prepare-test-image: |
500 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f TestImage.gmk prepare-test-image) |
500 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f TestImage.gmk prepare-test-image) |
501 |
501 |
541 test-image-failure-handler: |
541 test-image-failure-handler: |
542 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
542 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
543 -f BuildFailureHandler.gmk images) |
543 -f BuildFailureHandler.gmk images) |
544 endif |
544 endif |
545 |
545 |
|
546 build-microbenchmark: |
|
547 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f test/BuildMicrobenchmark.gmk) |
|
548 |
546 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
549 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
547 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
550 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
548 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
551 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
549 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
552 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
550 test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal |
553 test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal \ |
|
554 build-microbenchmark |
551 |
555 |
552 ################################################################################ |
556 ################################################################################ |
553 # Run tests |
557 # Run tests |
554 |
558 |
555 test: |
559 test: |
787 |
791 |
788 zip-source: gensrc rmic |
792 zip-source: gensrc rmic |
789 |
793 |
790 jrtfs-jar: interim-langtools |
794 jrtfs-jar: interim-langtools |
791 |
795 |
|
796 build-microbenchmark: interim-langtools jdk.unsupported java.management |
|
797 |
792 ifeq ($(ENABLE_GENERATE_CLASSLIST), true) |
798 ifeq ($(ENABLE_GENERATE_CLASSLIST), true) |
793 ifeq ($(CREATE_BUILDJDK), true) |
799 ifeq ($(CREATE_BUILDJDK), true) |
794 # If creating a buildjdk, the interim image needs to be based on that. |
800 # If creating a buildjdk, the interim image needs to be based on that. |
795 generate-link-opt-data: create-buildjdk |
801 generate-link-opt-data: create-buildjdk |
796 else ifeq ($(EXTERNAL_BUILDJDK), false) |
802 else ifeq ($(EXTERNAL_BUILDJDK), false) |
1020 |
1026 |
1021 # This target builds the test image |
1027 # This target builds the test image |
1022 test-image: prepare-test-image \ |
1028 test-image: prepare-test-image \ |
1023 test-image-jdk-jtreg-native test-image-failure-handler \ |
1029 test-image-jdk-jtreg-native test-image-failure-handler \ |
1024 test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS) |
1030 test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS) |
|
1031 |
|
1032 ifneq ($(JMH_CORE_JAR), ) |
|
1033 test-image: build-microbenchmark |
|
1034 endif |
1025 |
1035 |
1026 ################################################################################ |
1036 ################################################################################ |
1027 |
1037 |
1028 # all-images builds all our deliverables as images. |
1038 # all-images builds all our deliverables as images. |
1029 all-images: product-images test-image docs-image |
1039 all-images: product-images test-image docs-image |