equal
deleted
inserted
replaced
448 |
448 |
449 define DeclareRunTestRecipe |
449 define DeclareRunTestRecipe |
450 run-test-$1: |
450 run-test-$1: |
451 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1") |
451 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1") |
452 |
452 |
|
453 exploded-run-test-$1: |
|
454 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
|
455 TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
|
456 |
453 endef |
457 endef |
454 |
458 |
455 # ALL_NAMED_TESTS is defined in FindTests.gmk |
459 # ALL_NAMED_TESTS is defined in FindTests.gmk |
456 $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t))) |
460 $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t))) |
457 ALL_TEST_TARGETS := $(addprefix run-test-, $(ALL_NAMED_TESTS)) |
461 ALL_TEST_TARGETS := $(addprefix run-test-, $(ALL_NAMED_TESTS)) |
458 |
462 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-run-test-, $(ALL_NAMED_TESTS)) |
459 ALL_TARGETS += $(ALL_TEST_TARGETS) |
463 |
|
464 ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) |
460 |
465 |
461 ################################################################################ |
466 ################################################################################ |
462 # Build tests |
467 # Build tests |
463 # |
468 # |
464 |
469 |
482 +($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \ |
487 +($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \ |
483 test-image-jdk-jtreg-native) |
488 test-image-jdk-jtreg-native) |
484 |
489 |
485 run-test: |
490 run-test: |
486 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)") |
491 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)") |
|
492 |
|
493 exploded-run-test: |
|
494 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \ |
|
495 TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR)) |
487 |
496 |
488 ifeq ($(BUILD_GTEST), true) |
497 ifeq ($(BUILD_GTEST), true) |
489 test-image-hotspot-gtest: |
498 test-image-hotspot-gtest: |
490 +($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk) |
499 +($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk) |
491 endif |
500 endif |
512 |
521 |
513 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
522 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
514 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
523 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
515 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
524 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
516 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
525 test-failure-handler test-image-failure-handler test-image-hotspot-gtest \ |
517 run-test |
526 run-test exploded-run-test |
518 |
527 |
519 ################################################################################ |
528 ################################################################################ |
520 # Run tests |
529 # Run tests |
521 |
530 |
522 # Run tests specified by $(TEST), or the default test set. |
531 # Run tests specified by $(TEST), or the default test set. |
806 docs-zip: docs-jdk |
815 docs-zip: docs-jdk |
807 |
816 |
808 test: jdk-image test-image |
817 test: jdk-image test-image |
809 |
818 |
810 run-test: jdk-image test-image |
819 run-test: jdk-image test-image |
|
820 exploded-run-test: exploded-image test-image |
811 |
821 |
812 # Declare dependency for all generated test targets |
822 # Declare dependency for all generated test targets |
813 $(foreach t, $(ALL_TEST_TARGETS), $(eval $t: jdk-image test-image)) |
823 $(foreach t, $(ALL_TEST_TARGETS), $(eval $t: jdk-image test-image)) |
|
824 $(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image)) |
814 |
825 |
815 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
826 create-buildjdk-copy: jdk.jlink-java java.base-gendata \ |
816 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
827 $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) |
817 |
828 |
818 create-buildjdk-interim-image: create-buildjdk-copy |
829 create-buildjdk-interim-image: create-buildjdk-copy |