36 |
36 |
37 # Macro to run a test target in a subdir |
37 # Macro to run a test target in a subdir |
38 define SUBDIR_TEST # subdirectory target |
38 define SUBDIR_TEST # subdirectory target |
39 if [ -d $1 ] ; then \ |
39 if [ -d $1 ] ; then \ |
40 if [ -r $1/test/Makefile ] ; then \ |
40 if [ -r $1/test/Makefile ] ; then \ |
41 echo "$(MAKE) -C $1/test $2" ; \ |
41 echo "$(MAKE) -k -C $1/test $2" ; \ |
42 $(MAKE) -C $1/test $2 ; \ |
42 $(MAKE) -k -C $1/test $2 ; \ |
43 else \ |
43 else \ |
44 echo "ERROR: File does not exist: $1/test/Makefile"; \ |
44 echo "ERROR: File does not exist: $1/test/Makefile"; \ |
45 exit 1; \ |
45 exit 1; \ |
46 fi; \ |
46 fi; \ |
47 else \ |
47 else \ |
51 |
51 |
52 # Test target list for langtools repository |
52 # Test target list for langtools repository |
53 LANGTOOLS_TEST_LIST = langtools_jtreg |
53 LANGTOOLS_TEST_LIST = langtools_jtreg |
54 |
54 |
55 # Test target list for jdk repository |
55 # Test target list for jdk repository |
56 JDK_DEFAULT_TEST_LIST = \ |
56 JDK_ALL_TEST_LIST = \ |
57 jdk_beans1 \ |
57 jdk_beans1 \ |
58 jdk_io \ |
58 jdk_io \ |
59 jdk_lang \ |
59 jdk_lang \ |
60 jdk_math \ |
60 jdk_math \ |
61 jdk_other \ |
61 jdk_other \ |
62 jdk_net \ |
62 jdk_net \ |
63 jdk_nio \ |
63 jdk_nio \ |
64 jdk_security1 \ |
64 jdk_security1 \ |
65 jdk_text \ |
65 jdk_text \ |
66 jdk_util \ |
66 jdk_util \ |
67 jdk_time |
67 jdk_time \ |
68 |
|
69 # These tests are not part of the default testing list |
|
70 JDK_NONDEFAULT_TEST_LIST = \ |
|
71 jdk_awt \ |
68 jdk_awt \ |
72 jdk_beans2 jdk_beans3 \ |
69 jdk_beans2 jdk_beans3 \ |
73 jdk_management \ |
70 jdk_management \ |
74 jdk_jmx \ |
71 jdk_jmx \ |
75 jdk_security2 jdk_security3 \ |
72 jdk_security2 jdk_security3 \ |
78 jdk_swing \ |
75 jdk_swing \ |
79 jdk_tools \ |
76 jdk_tools \ |
80 jdk_jdi \ |
77 jdk_jdi \ |
81 jdk_jfr |
78 jdk_jfr |
82 |
79 |
83 # All jdk tests |
80 # Theses are meta test targets in jdk |
84 JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST) |
81 JDK_META_TEST_LIST = jdk_all jdk_default jdk_core |
85 |
82 |
86 # These are the current jck test targets in the jdk repository |
83 # These are the current jck test targets in the jdk repository |
87 JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime |
84 JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime |
88 |
85 |
89 # Default test target (everything) |
86 # Default test target (core) |
90 default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST) |
87 default: jdk_core $(LANGTOOLS_TEST_LIST) |
91 |
88 |
92 # All testing |
89 # All testing |
93 all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) |
90 all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) |
94 |
91 |
95 # Test targets |
92 # Test targets |
96 $(LANGTOOLS_TEST_LIST): |
93 $(LANGTOOLS_TEST_LIST): |
97 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) |
94 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) |
98 $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST): |
95 |
|
96 $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): |
99 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) |
97 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) |
100 |
98 |
101 clean: |
99 clean: |
102 |
100 |
103 ################################################################ |
101 ################################################################ |
104 |
102 |
105 # Phony targets (e.g. these are not filenames) |
103 # Phony targets (e.g. these are not filenames) |
106 .PHONY: all clean \ |
104 .PHONY: all clean \ |
107 $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \ |
105 $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \ |
108 $(LANGTOOLS_TEST_LIST) |
106 $(LANGTOOLS_TEST_LIST) |
109 |
107 |
110 ################################################################ |
108 ################################################################ |
111 |
109 |