1.1 --- a/test/Makefile Wed Feb 06 11:09:24 2013 -0800
1.2 +++ b/test/Makefile Wed Feb 06 11:12:46 2013 -0800
1.3 @@ -38,8 +38,8 @@
1.4 define SUBDIR_TEST # subdirectory target
1.5 if [ -d $1 ] ; then \
1.6 if [ -r $1/test/Makefile ] ; then \
1.7 - echo "$(MAKE) -C $1/test $2" ; \
1.8 - $(MAKE) -C $1/test $2 ; \
1.9 + echo "$(MAKE) -k -C $1/test $2" ; \
1.10 + $(MAKE) -k -C $1/test $2 ; \
1.11 else \
1.12 echo "ERROR: File does not exist: $1/test/Makefile"; \
1.13 exit 1; \
1.14 @@ -53,7 +53,7 @@
1.15 LANGTOOLS_TEST_LIST = langtools_jtreg
1.16
1.17 # Test target list for jdk repository
1.18 -JDK_DEFAULT_TEST_LIST = \
1.19 +JDK_ALL_TEST_LIST = \
1.20 jdk_beans1 \
1.21 jdk_io \
1.22 jdk_lang \
1.23 @@ -64,10 +64,7 @@
1.24 jdk_security1 \
1.25 jdk_text \
1.26 jdk_util \
1.27 - jdk_time
1.28 -
1.29 -# These tests are not part of the default testing list
1.30 -JDK_NONDEFAULT_TEST_LIST = \
1.31 + jdk_time \
1.32 jdk_awt \
1.33 jdk_beans2 jdk_beans3 \
1.34 jdk_management \
1.35 @@ -80,14 +77,14 @@
1.36 jdk_jdi \
1.37 jdk_jfr
1.38
1.39 -# All jdk tests
1.40 -JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST)
1.41 +# Theses are meta test targets in jdk
1.42 +JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
1.43
1.44 # These are the current jck test targets in the jdk repository
1.45 JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
1.46
1.47 -# Default test target (everything)
1.48 -default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST)
1.49 +# Default test target (core)
1.50 +default: jdk_core $(LANGTOOLS_TEST_LIST)
1.51
1.52 # All testing
1.53 all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
1.54 @@ -95,7 +92,8 @@
1.55 # Test targets
1.56 $(LANGTOOLS_TEST_LIST):
1.57 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
1.58 -$(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST):
1.59 +
1.60 +$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST):
1.61 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
1.62
1.63 clean:
1.64 @@ -104,7 +102,7 @@
1.65
1.66 # Phony targets (e.g. these are not filenames)
1.67 .PHONY: all clean \
1.68 - $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \
1.69 + $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
1.70 $(LANGTOOLS_TEST_LIST)
1.71
1.72 ################################################################
