diff options
| author | adinn <none@none> | 2013-06-28 14:59:12 +0100 |
|---|---|---|
| committer | adinn <none@none> | 2013-06-28 14:59:12 +0100 |
| commit | 4825fc928a1aeab8fd4dd6a41008d16155e3763d (patch) | |
| tree | 1d87e0617f6c8153af24b618beb26986c6da171a /test | |
| parent | 6da40bb88c79e98b57e220e90eaa732a917add23 (diff) | |
| parent | 2a0e74009320e48682d6d69eaf95826d0ababf00 (diff) | |
Merge
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/test/Makefile b/test/Makefile index 9e4d509..80f0b24 100644 --- a/test/Makefile +++ b/test/Makefile @@ -38,8 +38,8 @@ JDK_DIR=$(TOPDIR)/jdk define SUBDIR_TEST # subdirectory target if [ -d $1 ] ; then \ if [ -r $1/test/Makefile ] ; then \ - echo "$(MAKE) -C $1/test $2" ; \ - $(MAKE) -C $1/test $2 ; \ + echo "$(MAKE) -k -C $1/test $2" ; \ + $(MAKE) -k -C $1/test $2 ; \ else \ echo "ERROR: File does not exist: $1/test/Makefile"; \ exit 1; \ @@ -53,7 +53,7 @@ endef LANGTOOLS_TEST_LIST = langtools_jtreg # Test target list for jdk repository -JDK_DEFAULT_TEST_LIST = \ +JDK_ALL_TEST_LIST = \ jdk_beans1 \ jdk_io \ jdk_lang \ @@ -63,10 +63,8 @@ JDK_DEFAULT_TEST_LIST = \ jdk_nio \ jdk_security1 \ jdk_text \ - jdk_util - -# These tests are not part of the default testing list -JDK_NONDEFAULT_TEST_LIST = \ + jdk_util \ + jdk_time \ jdk_awt \ jdk_beans2 jdk_beans3 \ jdk_management \ @@ -79,14 +77,14 @@ JDK_NONDEFAULT_TEST_LIST = \ jdk_jdi \ jdk_jfr -# All jdk tests -JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST) +# 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 (everything) -default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST) +# Default test target (core) +default: jdk_core $(LANGTOOLS_TEST_LIST) # All testing all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) @@ -94,7 +92,8 @@ all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) # Test targets $(LANGTOOLS_TEST_LIST): @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) -$(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST): + +$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) clean: @@ -103,7 +102,7 @@ clean: # Phony targets (e.g. these are not filenames) .PHONY: all clean \ - $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \ + $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \ $(LANGTOOLS_TEST_LIST) ################################################################ |