equal
deleted
inserted
replaced
485 |
485 |
486 test-image-jdk-jtreg-native: |
486 test-image-jdk-jtreg-native: |
487 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \ |
487 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \ |
488 test-image-jdk-jtreg-native) |
488 test-image-jdk-jtreg-native) |
489 |
489 |
|
490 build-test-hotspot-jtreg-graal: |
|
491 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregGraalUnit.gmk \ |
|
492 build-test-hotspot-jtreg-graal) |
|
493 |
|
494 test-image-hotspot-jtreg-graal: |
|
495 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregGraalUnit.gmk \ |
|
496 test-image-hotspot-jtreg-graal) |
|
497 |
490 run-test: |
498 run-test: |
491 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)") |
499 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)") |
492 |
500 |
493 exploded-run-test: |
501 exploded-run-test: |
494 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
502 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
521 |
529 |
522 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
530 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
523 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
531 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
524 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
532 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
525 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
533 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
|
534 test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal \ |
526 run-test exploded-run-test |
535 run-test exploded-run-test |
527 |
536 |
528 ################################################################################ |
537 ################################################################################ |
529 # Run tests |
538 # Run tests |
530 |
539 |
851 build-test-hotspot-jtreg-native: buildtools-jdk \ |
860 build-test-hotspot-jtreg-native: buildtools-jdk \ |
852 hotspot-$(JVM_VARIANT_MAIN)-libs |
861 hotspot-$(JVM_VARIANT_MAIN)-libs |
853 |
862 |
854 build-test-jdk-jtreg-native: buildtools-jdk java.base-libs |
863 build-test-jdk-jtreg-native: buildtools-jdk java.base-libs |
855 |
864 |
|
865 build-test-hotspot-jtreg-graal: exploded-image-optimize |
|
866 |
856 test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native |
867 test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native |
857 |
868 |
858 test-image-jdk-jtreg-native: build-test-jdk-jtreg-native |
869 test-image-jdk-jtreg-native: build-test-jdk-jtreg-native |
|
870 |
|
871 test-image-hotspot-jtreg-graal: build-test-hotspot-jtreg-graal |
859 |
872 |
860 test-image-hotspot-gtest: hotspot |
873 test-image-hotspot-gtest: hotspot |
861 |
874 |
862 test-hotspot-internal: exploded-image |
875 test-hotspot-internal: exploded-image |
863 |
876 |
990 # This target builds the documentation image |
1003 # This target builds the documentation image |
991 docs-image: docs-jdk |
1004 docs-image: docs-jdk |
992 |
1005 |
993 # If not already set, set the JVM specific targets to build the test image |
1006 # If not already set, set the JVM specific targets to build the test image |
994 JVM_TEST_IMAGE_TARGETS ?= test-image-hotspot-jtreg-native test-image-hotspot-gtest |
1007 JVM_TEST_IMAGE_TARGETS ?= test-image-hotspot-jtreg-native test-image-hotspot-gtest |
|
1008 |
|
1009 ifeq ($(INCLUDE_GRAAL), true) |
|
1010 JVM_TEST_IMAGE_TARGETS += test-image-hotspot-jtreg-graal |
|
1011 endif |
995 |
1012 |
996 # This target builds the test image |
1013 # This target builds the test image |
997 test-image: prepare-test-image \ |
1014 test-image: prepare-test-image \ |
998 test-image-jdk-jtreg-native test-image-failure-handler \ |
1015 test-image-jdk-jtreg-native test-image-failure-handler \ |
999 test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS) |
1016 test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS) |