1.1 --- a/test/Makefile Tue Aug 20 17:44:35 2013 -0700
1.2 +++ b/test/Makefile Mon Aug 26 10:09:15 2013 -0700
1.3 @@ -49,61 +49,22 @@
1.4 fi
1.5 endef
1.6
1.7 -# Test target list for langtools repository
1.8 -LANGTOOLS_TEST_LIST = langtools_jtreg
1.9 -
1.10 -# Test target list for jdk repository
1.11 -JDK_ALL_TEST_LIST = \
1.12 - jdk_beans1 \
1.13 - jdk_io \
1.14 - jdk_lang \
1.15 - jdk_math \
1.16 - jdk_other \
1.17 - jdk_net \
1.18 - jdk_nio \
1.19 - jdk_security1 \
1.20 - jdk_text \
1.21 - jdk_util \
1.22 - jdk_time \
1.23 - jdk_awt \
1.24 - jdk_beans2 jdk_beans3 \
1.25 - jdk_management \
1.26 - jdk_jmx \
1.27 - jdk_security2 jdk_security3 \
1.28 - jdk_rmi \
1.29 - jdk_sound \
1.30 - jdk_swing \
1.31 - jdk_tools \
1.32 - jdk_jdi \
1.33 - jdk_jfr
1.34 -
1.35 -# Theses are meta test targets in jdk
1.36 -JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
1.37 -
1.38 -# These are the current jck test targets in the jdk repository
1.39 -JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
1.40 -
1.41 # Default test target (core)
1.42 -default: jdk_core $(LANGTOOLS_TEST_LIST)
1.43 +default: jdk_core langtools_jtreg
1.44
1.45 # All testing
1.46 -all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
1.47 +all: jdk_all langtools_all
1.48
1.49 # Test targets
1.50 -$(LANGTOOLS_TEST_LIST):
1.51 - @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
1.52 +langtools_% :
1.53 + @$(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_,,$@))
1.54
1.55 -$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST):
1.56 - @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
1.57 -
1.58 -clean:
1.59 +jdk_% :
1.60 + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
1.61
1.62 ################################################################
1.63
1.64 # Phony targets (e.g. these are not filenames)
1.65 -.PHONY: all clean \
1.66 - $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
1.67 - $(LANGTOOLS_TEST_LIST)
1.68 +.PHONY: all clean
1.69
1.70 ################################################################
1.71 -
