aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorohair <none@none>2011-03-22 11:07:40 -0700
committerohair <none@none>2011-03-22 11:07:40 -0700
commite1c42f31f4a1e7cc2e9f70cae4d392726a5d0dbe (patch)
tree5cc6a72c25b557d5ebd362a1a44076a09019b2ec
parent205a6cbb12b616a9b9ca1dea81ff79000994ef52 (diff)
downloadjdk8u-e1c42f31f4a1e7cc2e9f70cae4d392726a5d0dbe.tar.gz
6737397: Should support running JCK test suite with test/Makefile and JPRT
Reviewed-by: alanb
-rw-r--r--make/jprt.properties16
-rw-r--r--test/Makefile9
2 files changed, 22 insertions, 3 deletions
diff --git a/make/jprt.properties b/make/jprt.properties
index 777e27c..950fc52 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -323,6 +323,21 @@ jprt.make.rule.all.test.targets= \
${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 @@ jprt.test.targets=${jprt.vm.test.targets}
# Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev
-
diff --git a/test/Makefile b/test/Makefile
index 26d00bb..95c6946 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -73,13 +73,16 @@ JDK_TEST_LIST2 = \
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 @@ clean:
################################################################
# 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)
################################################################