diff options
| -rw-r--r-- | common/makefiles/Main.gmk | 2 | ||||
| -rw-r--r-- | test/Makefile | 53 |
2 files changed, 8 insertions, 47 deletions
diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk index 1214ce5..95db526 100644 --- a/common/makefiles/Main.gmk +++ b/common/makefiles/Main.gmk @@ -183,7 +183,7 @@ bootcycle-images-only: start-make test: images test-only test-only: start-make @$(call TargetEnter) - @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true + @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true @$(call TargetExit) # Stores the tips for each repository. This file is be used when constructing the jdk image and can be diff --git a/test/Makefile b/test/Makefile index 80f0b24..5bf2768 100644 --- a/test/Makefile +++ b/test/Makefile @@ -49,61 +49,22 @@ else \ fi endef -# Test target list for langtools repository -LANGTOOLS_TEST_LIST = langtools_jtreg - -# Test target list for jdk repository -JDK_ALL_TEST_LIST = \ - jdk_beans1 \ - jdk_io \ - jdk_lang \ - jdk_math \ - jdk_other \ - jdk_net \ - jdk_nio \ - jdk_security1 \ - jdk_text \ - jdk_util \ - jdk_time \ - jdk_awt \ - jdk_beans2 jdk_beans3 \ - jdk_management \ - jdk_jmx \ - jdk_security2 jdk_security3 \ - jdk_rmi \ - jdk_sound \ - jdk_swing \ - jdk_tools \ - jdk_jdi \ - jdk_jfr - -# Theses are meta test targets in jdk -JDK_META_TEST_LIST = jdk_all jdk_default jdk_core - -# These are the current jck test targets in the jdk repository -JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime - # Default test target (core) -default: jdk_core $(LANGTOOLS_TEST_LIST) +default: jdk_core langtools_jtreg # All testing -all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) +all: jdk_all langtools_all # Test targets -$(LANGTOOLS_TEST_LIST): - @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) - -$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): - @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) +langtools_% : + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_OUTPUT_DIR=$(ALT_OUTPUTDIR)/testoutput/langtools/jtreg JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) -clean: +jdk_% : + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) ################################################################ # Phony targets (e.g. these are not filenames) -.PHONY: all clean \ - $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \ - $(LANGTOOLS_TEST_LIST) +.PHONY: all clean ################################################################ - |