Skip to content

D
dragonwell8

openanolis / dragonwell8

通知 5
Star 3
Fork 0
D
dragonwell8

体验新版 GitCode，发现更多精彩内容 >>

提交 c50a9e7f 编写于 作者: L lana
浏览文件
操作

Merge

上级 5d6c6e61 cfb559f8
显示空白变更内容
内联 并排
Showing with 72 addition and 287 deletion
make/jprt.properties
浏览文件 @ c50a9e7f
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# Properties for jprt # Properties for jprt
# Release to build # Locked down to jdk8
jprt.tools.default.release=jdk8 jprt.tools.default.release=jdk8
# The different build flavors we want, we override here so we just get these 2 # The different build flavors we want, we override here so we just get these 2
...@@ -45,284 +45,61 @@ jprt.build.targets= \ ...@@ -45,284 +45,61 @@ jprt.build.targets= \
# User can select the test set with jprt submit "-testset name" option # User can select the test set with jprt submit "-testset name" option
jprt.my.test.set=${jprt.test.set} jprt.my.test.set=${jprt.test.set}
# Default vm test targets (no fastdebug & limited c2 testing) # Test target list (no fastdebug & limited c2 testing)
jprt.my.test.target.set= \
solaris_sparc_5.10-product-c1-TESTNAME, \
solaris_sparcv9_5.10-product-c2-TESTNAME, \
solaris_i586_5.10-product-c1-TESTNAME, \
solaris_x64_5.10-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
windows_i586_5.1-product-c1-TESTNAME, \
windows_x64_5.2-product-c2-TESTNAME
# Default vm test targets (testset=default)
jprt.vm.default.test.targets= \ jprt.vm.default.test.targets= \
\ ${jprt.my.test.target.set:TESTNAME=jvm98}, \
solaris_sparc_5.10-product-c1-jvm98, \ ${jprt.my.test.target.set:TESTNAME=scimark}
solaris_sparcv9_5.10-product-c2-jvm98, \
solaris_i586_5.10-product-c1-jvm98, \
solaris_x64_5.10-product-c2-jvm98, \
linux_i586_2.6-product-{c1|c2}-jvm98, \
linux_x64_2.6-product-c2-jvm98, \
windows_i586_5.1-product-c1-jvm98, \
windows_x64_5.2-product-c2-jvm98, \
\
solaris_sparc_5.10-product-c1-scimark, \
solaris_sparcv9_5.10-product-c2-scimark, \
solaris_i586_5.10-product-c1-scimark, \
solaris_x64_5.10-product-c2-scimark, \
linux_i586_2.6-product-{c1|c2}-scimark, \
linux_x64_2.6-product-c2-scimark, \
windows_i586_5.1-product-c1-scimark, \
windows_x64_5.2-product-c2-scimark
# Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing) # Default jdk test targets (testset=default)
jprt.make.rule.default.test.targets= \ jprt.make.rule.default.test.targets= \
\ ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
solaris_sparc_5.10-product-c1-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
solaris_sparcv9_5.10-product-c2-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_io}, \
solaris_i586_5.10-product-c1-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
solaris_x64_5.10-product-c2-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_math}, \
linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_misc}, \
linux_x64_2.6-product-c2-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_net}, \
windows_i586_5.1-product-c1-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
windows_x64_5.2-product-c2-langtools_jtreg, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
\ ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
solaris_sparc_5.10-product-c1-jdk_beans1, \ ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
solaris_sparcv9_5.10-product-c2-jdk_beans1, \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \
solaris_i586_5.10-product-c1-jdk_beans1, \ ${jprt.my.test.target.set:TESTNAME=jdk_util}
solaris_x64_5.10-product-c2-jdk_beans1, \
linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
linux_x64_2.6-product-c2-jdk_beans1, \
windows_i586_5.1-product-c1-jdk_beans1, \
windows_x64_5.2-product-c2-jdk_beans1, \
\
solaris_sparc_5.10-product-c1-jdk_io, \
solaris_sparcv9_5.10-product-c2-jdk_io, \
solaris_i586_5.10-product-c1-jdk_io, \
solaris_x64_5.10-product-c2-jdk_io, \
linux_i586_2.6-product-{c1|c2}-jdk_io, \
linux_x64_2.6-product-c2-jdk_io, \
windows_i586_5.1-product-c1-jdk_io, \
windows_x64_5.2-product-c2-jdk_io, \
\
solaris_sparc_5.10-product-c1-jdk_lang, \
solaris_sparcv9_5.10-product-c2-jdk_lang, \
solaris_i586_5.10-product-c1-jdk_lang, \
solaris_x64_5.10-product-c2-jdk_lang, \
linux_i586_2.6-product-{c1|c2}-jdk_lang, \
linux_x64_2.6-product-c2-jdk_lang, \
windows_i586_5.1-product-c1-jdk_lang, \
windows_x64_5.2-product-c2-jdk_lang, \
\
solaris_sparc_5.10-product-c1-jdk_math, \
solaris_sparcv9_5.10-product-c2-jdk_math, \
solaris_i586_5.10-product-c1-jdk_math, \
solaris_x64_5.10-product-c2-jdk_math, \
linux_i586_2.6-product-{c1|c2}-jdk_math, \
linux_x64_2.6-product-c2-jdk_math, \
windows_i586_5.1-product-c1-jdk_math, \
windows_x64_5.2-product-c2-jdk_math, \
\
solaris_sparc_5.10-product-c1-jdk_misc, \
solaris_sparcv9_5.10-product-c2-jdk_misc, \
solaris_i586_5.10-product-c1-jdk_misc, \
solaris_x64_5.10-product-c2-jdk_misc, \
linux_i586_2.6-product-{c1|c2}-jdk_misc, \
linux_x64_2.6-product-c2-jdk_misc, \
windows_i586_5.1-product-c1-jdk_misc, \
windows_x64_5.2-product-c2-jdk_misc, \
\
solaris_sparc_5.10-product-c1-jdk_net, \
solaris_sparcv9_5.10-product-c2-jdk_net, \
solaris_i586_5.10-product-c1-jdk_net, \
solaris_x64_5.10-product-c2-jdk_net, \
linux_i586_2.6-product-{c1|c2}-jdk_net, \
linux_x64_2.6-product-c2-jdk_net, \
windows_i586_5.1-product-c1-jdk_net, \
windows_x64_5.2-product-c2-jdk_net, \
\
solaris_sparc_5.10-product-c1-jdk_nio1, \
solaris_sparcv9_5.10-product-c2-jdk_nio1, \
solaris_i586_5.10-product-c1-jdk_nio1, \
solaris_x64_5.10-product-c2-jdk_nio1, \
linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
linux_x64_2.6-product-c2-jdk_nio1, \
windows_i586_5.1-product-c1-jdk_nio1, \
windows_x64_5.2-product-c2-jdk_nio1, \
\
solaris_sparc_5.10-product-c1-jdk_nio2, \
solaris_sparcv9_5.10-product-c2-jdk_nio2, \
solaris_i586_5.10-product-c1-jdk_nio2, \
solaris_x64_5.10-product-c2-jdk_nio2, \
linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
linux_x64_2.6-product-c2-jdk_nio2, \
windows_i586_5.1-product-c1-jdk_nio2, \
windows_x64_5.2-product-c2-jdk_nio2, \
\
solaris_sparc_5.10-product-c1-jdk_nio3, \
solaris_sparcv9_5.10-product-c2-jdk_nio3, \
solaris_i586_5.10-product-c1-jdk_nio3, \
solaris_x64_5.10-product-c2-jdk_nio3, \
linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
linux_x64_2.6-product-c2-jdk_nio3, \
windows_i586_5.1-product-c1-jdk_nio3, \
windows_x64_5.2-product-c2-jdk_nio3, \
\
solaris_sparc_5.10-product-c1-jdk_security1, \
solaris_sparcv9_5.10-product-c2-jdk_security1, \
solaris_i586_5.10-product-c1-jdk_security1, \
solaris_x64_5.10-product-c2-jdk_security1, \
linux_i586_2.6-product-{c1|c2}-jdk_security1, \
linux_x64_2.6-product-c2-jdk_security1, \
windows_i586_5.1-product-c1-jdk_security1, \
windows_x64_5.2-product-c2-jdk_security1, \
\
solaris_sparc_5.10-product-c1-jdk_text, \
solaris_sparcv9_5.10-product-c2-jdk_text, \
solaris_i586_5.10-product-c1-jdk_text, \
solaris_x64_5.10-product-c2-jdk_text, \
linux_i586_2.6-product-{c1|c2}-jdk_text, \
linux_x64_2.6-product-c2-jdk_text, \
windows_i586_5.1-product-c1-jdk_text, \
windows_x64_5.2-product-c2-jdk_text, \
\
solaris_sparc_5.10-product-c1-jdk_tools1, \
solaris_sparcv9_5.10-product-c2-jdk_tools1, \
solaris_i586_5.10-product-c1-jdk_tools1, \
solaris_x64_5.10-product-c2-jdk_tools1, \
linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
linux_x64_2.6-product-c2-jdk_tools1, \
windows_i586_5.1-product-c1-jdk_tools1, \
windows_x64_5.2-product-c2-jdk_tools1, \
\
solaris_sparc_5.10-product-c1-jdk_util, \
solaris_sparcv9_5.10-product-c2-jdk_util, \
solaris_i586_5.10-product-c1-jdk_util, \
solaris_x64_5.10-product-c2-jdk_util, \
linux_i586_2.6-product-{c1|c2}-jdk_util, \
linux_x64_2.6-product-c2-jdk_util, \
windows_i586_5.1-product-c1-jdk_util, \
windows_x64_5.2-product-c2-jdk_util
# All vm test targets (but still no fastdebug & limited c2 testing) # All vm test targets (testset=all)
jprt.vm.all.test.targets= \ jprt.vm.all.test.targets= \
\
${jprt.vm.default.test.targets}, \ ${jprt.vm.default.test.targets}, \
\ ${jprt.my.test.target.set:TESTNAME=runThese}, \
solaris_sparc_5.10-product-c1-runThese, \ ${jprt.my.test.target.set:TESTNAME=jbb_default}
solaris_sparcv9_5.10-product-c2-runThese, \
solaris_i586_5.10-product-c1-runThese, \
solaris_x64_5.10-product-c2-runThese, \
linux_i586_2.6-product-{c1|c2}-runThese, \
linux_x64_2.6-product-c2-runThese, \
windows_i586_5.1-product-c1-runThese, \
windows_x64_5.2-product-c2-runThese, \
\
solaris_sparc_5.10-product-c1-jbb_default, \
solaris_sparcv9_5.10-product-c2-jbb_default, \
solaris_i586_5.10-product-c1-jbb_default, \
solaris_x64_5.10-product-c2-jbb_default, \
linux_i586_2.6-product-{c1|c2}-jbb_default, \
linux_x64_2.6-product-c2-jbb_default, \
windows_i586_5.1-product-c1-jbb_default, \
windows_x64_5.2-product-c2-jbb_default
# All jdk test targets (but still no fastdebug & limited c2 testing) # All jdk test targets (testset=all)
jprt.make.rule.all.test.targets= \ jprt.make.rule.all.test.targets= \
\
${jprt.make.rule.default.test.targets}, \ ${jprt.make.rule.default.test.targets}, \
\ ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
solaris_sparc_5.10-product-c1-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
solaris_sparcv9_5.10-product-c2-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
solaris_i586_5.10-product-c1-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
solaris_x64_5.10-product-c2-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
linux_i586_2.6-product-{c1|c2}-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
linux_x64_2.6-product-c2-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
windows_i586_5.1-product-c1-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
windows_x64_5.2-product-c2-jdk_awt, \ ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
\ ${jprt.my.test.target.set:TESTNAME=jdk_swing}, \
solaris_sparc_5.10-product-c1-jdk_beans2, \ ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
solaris_sparcv9_5.10-product-c2-jdk_beans2, \ ${jprt.my.test.target.set:TESTNAME=jdk_tools2}
solaris_i586_5.10-product-c1-jdk_beans2, \
solaris_x64_5.10-product-c2-jdk_beans2, \
linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
linux_x64_2.6-product-c2-jdk_beans2, \
windows_i586_5.1-product-c1-jdk_beans2, \
windows_x64_5.2-product-c2-jdk_beans2, \
\
solaris_sparc_5.10-product-c1-jdk_beans3, \
solaris_sparcv9_5.10-product-c2-jdk_beans3, \
solaris_i586_5.10-product-c1-jdk_beans3, \
solaris_x64_5.10-product-c2-jdk_beans3, \
linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
linux_x64_2.6-product-c2-jdk_beans3, \
windows_i586_5.1-product-c1-jdk_beans3, \
windows_x64_5.2-product-c2-jdk_beans3, \
\
solaris_sparc_5.10-product-c1-jdk_management1, \
solaris_sparcv9_5.10-product-c2-jdk_management1, \
solaris_i586_5.10-product-c1-jdk_management1, \
solaris_x64_5.10-product-c2-jdk_management1, \
linux_i586_2.6-product-{c1|c2}-jdk_management1, \
linux_x64_2.6-product-c2-jdk_management1, \
windows_i586_5.1-product-c1-jdk_management1, \
windows_x64_5.2-product-c2-jdk_management1, \
\
solaris_sparc_5.10-product-c1-jdk_management2, \
solaris_sparcv9_5.10-product-c2-jdk_management2, \
solaris_i586_5.10-product-c1-jdk_management2, \
solaris_x64_5.10-product-c2-jdk_management2, \
linux_i586_2.6-product-{c1|c2}-jdk_management2, \
linux_x64_2.6-product-c2-jdk_management2, \
windows_i586_5.1-product-c1-jdk_management2, \
windows_x64_5.2-product-c2-jdk_management2, \
\
solaris_sparc_5.10-product-c1-jdk_rmi, \
solaris_sparcv9_5.10-product-c2-jdk_rmi, \
solaris_i586_5.10-product-c1-jdk_rmi, \
solaris_x64_5.10-product-c2-jdk_rmi, \
linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
linux_x64_2.6-product-c2-jdk_rmi, \
windows_i586_5.1-product-c1-jdk_rmi, \
windows_x64_5.2-product-c2-jdk_rmi, \
\
solaris_sparc_5.10-product-c1-jdk_security2, \
solaris_sparcv9_5.10-product-c2-jdk_security2, \
solaris_i586_5.10-product-c1-jdk_security2, \
solaris_x64_5.10-product-c2-jdk_security2, \
linux_i586_2.6-product-{c1|c2}-jdk_security2, \
linux_x64_2.6-product-c2-jdk_security2, \
windows_i586_5.1-product-c1-jdk_security2, \
windows_x64_5.2-product-c2-jdk_security2, \
\
solaris_sparc_5.10-product-c1-jdk_security3, \
solaris_sparcv9_5.10-product-c2-jdk_security3, \
solaris_i586_5.10-product-c1-jdk_security3, \
solaris_x64_5.10-product-c2-jdk_security3, \
linux_i586_2.6-product-{c1|c2}-jdk_security3, \
linux_x64_2.6-product-c2-jdk_security3, \
windows_i586_5.1-product-c1-jdk_security3, \
windows_x64_5.2-product-c2-jdk_security3, \
\
solaris_sparc_5.10-product-c1-jdk_sound, \
solaris_sparcv9_5.10-product-c2-jdk_sound, \
solaris_i586_5.10-product-c1-jdk_sound, \
solaris_x64_5.10-product-c2-jdk_sound, \
linux_i586_2.6-product-{c1|c2}-jdk_sound, \
linux_x64_2.6-product-c2-jdk_sound, \
windows_i586_5.1-product-c1-jdk_sound, \
windows_x64_5.2-product-c2-jdk_sound, \
\
solaris_sparc_5.10-product-c1-jdk_swing, \
solaris_sparcv9_5.10-product-c2-jdk_swing, \
solaris_i586_5.10-product-c1-jdk_swing, \
solaris_x64_5.10-product-c2-jdk_swing, \
linux_i586_2.6-product-{c1|c2}-jdk_swing, \
linux_x64_2.6-product-c2-jdk_swing, \
windows_i586_5.1-product-c1-jdk_swing, \
windows_x64_5.2-product-c2-jdk_swing, \
\
solaris_sparc_5.10-product-c1-jdk_tools2, \
solaris_sparcv9_5.10-product-c2-jdk_tools2, \
solaris_i586_5.10-product-c1-jdk_tools2, \
solaris_x64_5.10-product-c2-jdk_tools2, \
linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
linux_x64_2.6-product-c2-jdk_tools2, \
windows_i586_5.1-product-c1-jdk_tools2, \
windows_x64_5.2-product-c2-jdk_tools2
# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken) # JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \ jprt.my.jck.test.target.set= \
solaris_sparc_5.10-product-c1-JCK7TESTRULE, \ solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \ solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
...@@ -341,8 +118,7 @@ jprt.make.rule.jck.test.targets= \ ...@@ -341,8 +118,7 @@ jprt.make.rule.jck.test.targets= \
jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets} 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} jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
jprt.vm..test.targets=${jprt.vm.default.test.targets} jprt.vm..test.targets=${jprt.vm.default.test.targets}
jprt.vm.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets} jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
jprt.test.targets=${jprt.vm.test.targets}
# Directories to be excluded from the source bundles # Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev jprt.bundle.exclude.src.dirs=build dist webrev
......
test/Makefile
浏览文件 @ c50a9e7f
...@@ -53,36 +53,45 @@ endef ...@@ -53,36 +53,45 @@ endef
LANGTOOLS_TEST_LIST = langtools_jtreg LANGTOOLS_TEST_LIST = langtools_jtreg
# Test target list for jdk repository # Test target list for jdk repository
JDK_TEST_LIST = \ JDK_DEFAULT_TEST_LIST = \
jdk_beans1 jdk_beans2 jdk_beans3 \ jdk_beans1 \
jdk_io \ jdk_io \
jdk_lang \ jdk_lang \
jdk_management1 jdk_management2 \
jdk_math \ jdk_math \
jdk_misc \ jdk_misc \
jdk_net \ jdk_net \
jdk_nio1 jdk_nio2 jdk_nio3 \ jdk_nio1 jdk_nio2 jdk_nio3 \
jdk_security1 jdk_security2 jdk_security3 \ jdk_security1 \
jdk_text \ jdk_text \
jdk_tools1 jdk_tools2 \
jdk_util jdk_util
# These tests need a DISPLAY and can create window interaction complications # These tests are not part of the default testing list
JDK_TEST_LIST2 = \ JDK_NONDEFAULT_TEST_LIST = \
jdk_awt \ jdk_awt \
jdk_beans2 jdk_beans3 \
jdk_management1 jdk_management2 \
jdk_security2 jdk_security3 \
jdk_rmi \ jdk_rmi \
jdk_swing jdk_sound \
jdk_swing \
jdk_tools1 jdk_tools2
# All jdk tests
JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST)
# These are the current jck test targets in the jdk repository # These are the current jck test targets in the jdk repository
JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
# Default test target (everything) # Default test target (everything)
all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST) default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST)
# All testing
all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
# Test targets # Test targets
$(LANGTOOLS_TEST_LIST): $(LANGTOOLS_TEST_LIST):
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
$(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST): $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST):
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
clean: clean:
...@@ -91,7 +100,7 @@ clean: ...@@ -91,7 +100,7 @@ clean:
# Phony targets (e.g. these are not filenames) # Phony targets (e.g. these are not filenames)
.PHONY: all clean \ .PHONY: all clean \
$(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST) \ $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \
$(LANGTOOLS_TEST_LIST) $(LANGTOOLS_TEST_LIST)
################################################################ ################################################################
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或