7069993: Adjust make/jprt.properties file for jdk8
Reviewed-by: katleman
This commit is contained in:
parent
cb2baedec2
commit
5ed600c64e
@ -25,22 +25,12 @@
|
||||
|
||||
# Properties for jprt
|
||||
|
||||
# At submit time, the release supplied will be in jprt.submit.release
|
||||
# and will be one of the official release names defined in jprt.
|
||||
# jprt supports property value expansion using ${property.name} syntax.
|
||||
|
||||
# This tells jprt what default release we want to build
|
||||
jprt.tools.default.release=${jprt.submit.release}
|
||||
# Release to build
|
||||
jprt.tools.default.release=jdk8
|
||||
|
||||
# The different build flavors we want, we override here so we just get these 2
|
||||
jprt.build.flavors=product,fastdebug
|
||||
|
||||
# Define the Windows we want (temporary)
|
||||
jprt.my.windows.i586.jdk7b107=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk7temp=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk7=windows_i586_5.1
|
||||
jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
|
||||
|
||||
# Standard list of jprt build targets for this source tree
|
||||
jprt.build.targets= \
|
||||
solaris_sparc_5.10-{product|fastdebug}, \
|
||||
@ -49,7 +39,7 @@ jprt.build.targets= \
|
||||
solaris_x64_5.10-{product|fastdebug}, \
|
||||
linux_i586_2.6-{product|fastdebug}, \
|
||||
linux_x64_2.6-{product|fastdebug}, \
|
||||
${jprt.my.windows.i586}-{product|fastdebug}, \
|
||||
windows_i586_5.1-{product|fastdebug}, \
|
||||
windows_x64_5.2-{product|fastdebug}
|
||||
|
||||
# User can select the test set with jprt submit "-testset name" option
|
||||
@ -64,7 +54,7 @@ jprt.vm.default.test.targets= \
|
||||
solaris_x64_5.10-product-c2-jvm98, \
|
||||
linux_i586_2.6-product-{c1|c2}-jvm98, \
|
||||
linux_x64_2.6-product-c2-jvm98, \
|
||||
${jprt.my.windows.i586}-product-c1-jvm98, \
|
||||
windows_i586_5.1-product-c1-jvm98, \
|
||||
windows_x64_5.2-product-c2-jvm98, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-scimark, \
|
||||
@ -73,7 +63,7 @@ jprt.vm.default.test.targets= \
|
||||
solaris_x64_5.10-product-c2-scimark, \
|
||||
linux_i586_2.6-product-{c1|c2}-scimark, \
|
||||
linux_x64_2.6-product-c2-scimark, \
|
||||
${jprt.my.windows.i586}-product-c1-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)
|
||||
@ -85,7 +75,7 @@ jprt.make.rule.default.test.targets= \
|
||||
solaris_x64_5.10-product-c2-langtools_jtreg, \
|
||||
linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \
|
||||
linux_x64_2.6-product-c2-langtools_jtreg, \
|
||||
${jprt.my.windows.i586}-product-c1-langtools_jtreg, \
|
||||
windows_i586_5.1-product-c1-langtools_jtreg, \
|
||||
windows_x64_5.2-product-c2-langtools_jtreg, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans1, \
|
||||
@ -94,7 +84,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -103,7 +93,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -112,7 +102,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -121,7 +111,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -130,7 +120,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -139,7 +129,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -148,7 +138,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -157,7 +147,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -166,7 +156,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -175,7 +165,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -184,7 +174,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -193,7 +183,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -202,7 +192,7 @@ jprt.make.rule.default.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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)
|
||||
@ -216,7 +206,7 @@ jprt.vm.all.test.targets= \
|
||||
solaris_x64_5.10-product-c2-runThese, \
|
||||
linux_i586_2.6-product-{c1|c2}-runThese, \
|
||||
linux_x64_2.6-product-c2-runThese, \
|
||||
${jprt.my.windows.i586}-product-c1-runThese, \
|
||||
windows_i586_5.1-product-c1-runThese, \
|
||||
windows_x64_5.2-product-c2-runThese, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jbb_default, \
|
||||
@ -225,7 +215,7 @@ jprt.vm.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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)
|
||||
@ -239,7 +229,7 @@ jprt.make.rule.all.test.targets= \
|
||||
solaris_x64_5.10-product-c2-jdk_awt, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_awt, \
|
||||
linux_x64_2.6-product-c2-jdk_awt, \
|
||||
${jprt.my.windows.i586}-product-c1-jdk_awt, \
|
||||
windows_i586_5.1-product-c1-jdk_awt, \
|
||||
windows_x64_5.2-product-c2-jdk_awt, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans2, \
|
||||
@ -248,7 +238,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -257,7 +247,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -266,7 +256,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -275,7 +265,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -284,7 +274,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -293,7 +283,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -302,7 +292,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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_swing, \
|
||||
@ -311,7 +301,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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, \
|
||||
@ -320,7 +310,7 @@ jprt.make.rule.all.test.targets= \
|
||||
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, \
|
||||
${jprt.my.windows.i586}-product-c1-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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user