diff options
| author | ohair <none@none> | 2010-06-21 11:00:15 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2010-06-21 11:00:15 -0700 |
| commit | 80800fe86ca39767daf3b26145cbc2cd992424a1 (patch) | |
| tree | 5788d5a94b69d3ce42b02709dc326d9a5cc741e7 /test | |
| parent | 208c1ef22eab08a3924e773f3db9f8fc2d70d119 (diff) | |
6960853: Cleanup makefiles, remove unused vars etc.
6959596: Windows fastdebug build broken
6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches
Reviewed-by: alanb
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/test/Makefile b/test/Makefile index a1b7e6a..0e21411 100644 --- a/test/Makefile +++ b/test/Makefile @@ -54,30 +54,33 @@ LANGTOOLS_TEST_LIST = langtools_jtreg # Test target list for jdk repository JDK_TEST_LIST = \ - jdk_awt \ - jdk_beans jdk_beans1 jdk_beans2 jdk_beans3 \ + jdk_beans1 jdk_beans2 jdk_beans3 \ jdk_io \ jdk_lang \ - jdk_management jdk_management1 jdk_management2 \ + jdk_management1 jdk_management2 \ jdk_math \ jdk_misc \ jdk_net \ - jdk_nio jdk_nio1 jdk_nio2 jdk_nio3 \ - jdk_rmi \ - jdk_security jdk_security1 jdk_security2 jdk_security3 \ - jdk_swing \ + jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_security1 jdk_security2 jdk_security3 \ jdk_text \ - jdk_tools jdk_tools1 jdk_tools2 \ + jdk_tools1 jdk_tools2 \ jdk_util +# These tests need a DISPLAY and can create window interaction complications +JDK_TEST_LIST2 = \ + jdk_awt \ + jdk_rmi \ + jdk_swing + # Default test target (everything) all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST) # Test targets $(LANGTOOLS_TEST_LIST): - @$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) $(JDK_TEST_LIST): - @$(call SUBDIR_TEST, $(JDK_DIR), $@) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) clean: |