6737397: Should support running JCK test suite with test/Makefile and JPRT
Reviewed-by: alanb
--- a/make/jprt.properties Thu Mar 17 14:32:38 2011 -0700
+++ b/make/jprt.properties Tue Mar 22 11:07:40 2011 -0700
@@ -323,6 +323,21 @@
${jprt.my.windows.i586}-product-c1-jdk_tools2, \
windows_x64_5.2-product-c2-jdk_tools2
+# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
+jprt.my.jck.test.target.set= \
+ solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
+ solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
+ solaris_i586_5.10-product-c1-JCK7TESTRULE, \
+ solaris_x64_5.10-product-c2-JCK7TESTRULE, \
+ linux_i586_2.6-product-c1-JCK7TESTRULE, \
+ linux_x64_2.6-product-c2-JCK7TESTRULE
+
+# JCK testset targets (e.g. jprt submit -testset jck ... )
+jprt.make.rule.jck.test.targets= \
+ ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools}, \
+ ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime}, \
+ ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
+
# Select list to use (allow for testset to be empty too)
jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
@@ -333,4 +348,3 @@
# Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev
-
--- a/test/Makefile Thu Mar 17 14:32:38 2011 -0700
+++ b/test/Makefile Tue Mar 22 11:07:40 2011 -0700
@@ -73,13 +73,16 @@
jdk_rmi \
jdk_swing
+# These are the current jck test targets in the jdk repository
+JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
+
# Default test target (everything)
all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
# Test targets
$(LANGTOOLS_TEST_LIST):
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
-$(JDK_TEST_LIST) $(JDK_TEST_LIST2):
+$(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST):
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
clean:
@@ -87,7 +90,9 @@
################################################################
# Phony targets (e.g. these are not filenames)
-.PHONY: all clean $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
+.PHONY: all clean \
+ $(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST) \
+ $(LANGTOOLS_TEST_LIST)
################################################################