1.1 --- a/test/Makefile Thu Nov 17 10:45:47 2011 -0800
1.2 +++ b/test/Makefile Mon Dec 12 08:11:05 2011 -0800
1.3 @@ -53,36 +53,45 @@
1.4 LANGTOOLS_TEST_LIST = langtools_jtreg
1.5
1.6 # Test target list for jdk repository
1.7 -JDK_TEST_LIST = \
1.8 - jdk_beans1 jdk_beans2 jdk_beans3 \
1.9 +JDK_DEFAULT_TEST_LIST = \
1.10 + jdk_beans1 \
1.11 jdk_io \
1.12 jdk_lang \
1.13 - jdk_management1 jdk_management2 \
1.14 jdk_math \
1.15 jdk_misc \
1.16 jdk_net \
1.17 jdk_nio1 jdk_nio2 jdk_nio3 \
1.18 - jdk_security1 jdk_security2 jdk_security3 \
1.19 + jdk_security1 \
1.20 jdk_text \
1.21 - jdk_tools1 jdk_tools2 \
1.22 jdk_util
1.23
1.24 -# These tests need a DISPLAY and can create window interaction complications
1.25 -JDK_TEST_LIST2 = \
1.26 +# These tests are not part of the default testing list
1.27 +JDK_NONDEFAULT_TEST_LIST = \
1.28 jdk_awt \
1.29 + jdk_beans2 jdk_beans3 \
1.30 + jdk_management1 jdk_management2 \
1.31 + jdk_security2 jdk_security3 \
1.32 jdk_rmi \
1.33 - jdk_swing
1.34 + jdk_sound \
1.35 + jdk_swing \
1.36 + jdk_tools1 jdk_tools2
1.37 +
1.38 +# All jdk tests
1.39 +JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST)
1.40
1.41 # These are the current jck test targets in the jdk repository
1.42 JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
1.43
1.44 # Default test target (everything)
1.45 -all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
1.46 +default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST)
1.47 +
1.48 +# All testing
1.49 +all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
1.50
1.51 # Test targets
1.52 $(LANGTOOLS_TEST_LIST):
1.53 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
1.54 -$(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST):
1.55 +$(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST):
1.56 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
1.57
1.58 clean:
1.59 @@ -91,7 +100,7 @@
1.60
1.61 # Phony targets (e.g. these are not filenames)
1.62 .PHONY: all clean \
1.63 - $(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST) \
1.64 + $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \
1.65 $(LANGTOOLS_TEST_LIST)
1.66
1.67 ################################################################
