1.1 --- a/make/jprt.properties Thu Nov 17 10:45:47 2011 -0800
1.2 +++ b/make/jprt.properties Mon Dec 12 08:11:05 2011 -0800
1.3 @@ -25,7 +25,7 @@
1.4
1.5 # Properties for jprt
1.6
1.7 -# Release to build
1.8 +# Locked down to jdk8
1.9 jprt.tools.default.release=jdk8
1.10
1.11 # The different build flavors we want, we override here so we just get these 2
1.12 @@ -45,284 +45,61 @@
1.13 # User can select the test set with jprt submit "-testset name" option
1.14 jprt.my.test.set=${jprt.test.set}
1.15
1.16 -# Default vm test targets (no fastdebug & limited c2 testing)
1.17 +# Test target list (no fastdebug & limited c2 testing)
1.18 +jprt.my.test.target.set= \
1.19 + solaris_sparc_5.10-product-c1-TESTNAME, \
1.20 + solaris_sparcv9_5.10-product-c2-TESTNAME, \
1.21 + solaris_i586_5.10-product-c1-TESTNAME, \
1.22 + solaris_x64_5.10-product-c2-TESTNAME, \
1.23 + linux_i586_2.6-product-{c1|c2}-TESTNAME, \
1.24 + linux_x64_2.6-product-c2-TESTNAME, \
1.25 + windows_i586_5.1-product-c1-TESTNAME, \
1.26 + windows_x64_5.2-product-c2-TESTNAME
1.27 +
1.28 +# Default vm test targets (testset=default)
1.29 jprt.vm.default.test.targets= \
1.30 - \
1.31 - solaris_sparc_5.10-product-c1-jvm98, \
1.32 - solaris_sparcv9_5.10-product-c2-jvm98, \
1.33 - solaris_i586_5.10-product-c1-jvm98, \
1.34 - solaris_x64_5.10-product-c2-jvm98, \
1.35 - linux_i586_2.6-product-{c1|c2}-jvm98, \
1.36 - linux_x64_2.6-product-c2-jvm98, \
1.37 - windows_i586_5.1-product-c1-jvm98, \
1.38 - windows_x64_5.2-product-c2-jvm98, \
1.39 - \
1.40 - solaris_sparc_5.10-product-c1-scimark, \
1.41 - solaris_sparcv9_5.10-product-c2-scimark, \
1.42 - solaris_i586_5.10-product-c1-scimark, \
1.43 - solaris_x64_5.10-product-c2-scimark, \
1.44 - linux_i586_2.6-product-{c1|c2}-scimark, \
1.45 - linux_x64_2.6-product-c2-scimark, \
1.46 - windows_i586_5.1-product-c1-scimark, \
1.47 - windows_x64_5.2-product-c2-scimark
1.48 + ${jprt.my.test.target.set:TESTNAME=jvm98}, \
1.49 + ${jprt.my.test.target.set:TESTNAME=scimark}
1.50
1.51 -# Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing)
1.52 +# Default jdk test targets (testset=default)
1.53 jprt.make.rule.default.test.targets= \
1.54 - \
1.55 - solaris_sparc_5.10-product-c1-langtools_jtreg, \
1.56 - solaris_sparcv9_5.10-product-c2-langtools_jtreg, \
1.57 - solaris_i586_5.10-product-c1-langtools_jtreg, \
1.58 - solaris_x64_5.10-product-c2-langtools_jtreg, \
1.59 - linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \
1.60 - linux_x64_2.6-product-c2-langtools_jtreg, \
1.61 - windows_i586_5.1-product-c1-langtools_jtreg, \
1.62 - windows_x64_5.2-product-c2-langtools_jtreg, \
1.63 - \
1.64 - solaris_sparc_5.10-product-c1-jdk_beans1, \
1.65 - solaris_sparcv9_5.10-product-c2-jdk_beans1, \
1.66 - solaris_i586_5.10-product-c1-jdk_beans1, \
1.67 - solaris_x64_5.10-product-c2-jdk_beans1, \
1.68 - linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
1.69 - linux_x64_2.6-product-c2-jdk_beans1, \
1.70 - windows_i586_5.1-product-c1-jdk_beans1, \
1.71 - windows_x64_5.2-product-c2-jdk_beans1, \
1.72 - \
1.73 - solaris_sparc_5.10-product-c1-jdk_io, \
1.74 - solaris_sparcv9_5.10-product-c2-jdk_io, \
1.75 - solaris_i586_5.10-product-c1-jdk_io, \
1.76 - solaris_x64_5.10-product-c2-jdk_io, \
1.77 - linux_i586_2.6-product-{c1|c2}-jdk_io, \
1.78 - linux_x64_2.6-product-c2-jdk_io, \
1.79 - windows_i586_5.1-product-c1-jdk_io, \
1.80 - windows_x64_5.2-product-c2-jdk_io, \
1.81 - \
1.82 - solaris_sparc_5.10-product-c1-jdk_lang, \
1.83 - solaris_sparcv9_5.10-product-c2-jdk_lang, \
1.84 - solaris_i586_5.10-product-c1-jdk_lang, \
1.85 - solaris_x64_5.10-product-c2-jdk_lang, \
1.86 - linux_i586_2.6-product-{c1|c2}-jdk_lang, \
1.87 - linux_x64_2.6-product-c2-jdk_lang, \
1.88 - windows_i586_5.1-product-c1-jdk_lang, \
1.89 - windows_x64_5.2-product-c2-jdk_lang, \
1.90 - \
1.91 - solaris_sparc_5.10-product-c1-jdk_math, \
1.92 - solaris_sparcv9_5.10-product-c2-jdk_math, \
1.93 - solaris_i586_5.10-product-c1-jdk_math, \
1.94 - solaris_x64_5.10-product-c2-jdk_math, \
1.95 - linux_i586_2.6-product-{c1|c2}-jdk_math, \
1.96 - linux_x64_2.6-product-c2-jdk_math, \
1.97 - windows_i586_5.1-product-c1-jdk_math, \
1.98 - windows_x64_5.2-product-c2-jdk_math, \
1.99 - \
1.100 - solaris_sparc_5.10-product-c1-jdk_misc, \
1.101 - solaris_sparcv9_5.10-product-c2-jdk_misc, \
1.102 - solaris_i586_5.10-product-c1-jdk_misc, \
1.103 - solaris_x64_5.10-product-c2-jdk_misc, \
1.104 - linux_i586_2.6-product-{c1|c2}-jdk_misc, \
1.105 - linux_x64_2.6-product-c2-jdk_misc, \
1.106 - windows_i586_5.1-product-c1-jdk_misc, \
1.107 - windows_x64_5.2-product-c2-jdk_misc, \
1.108 - \
1.109 - solaris_sparc_5.10-product-c1-jdk_net, \
1.110 - solaris_sparcv9_5.10-product-c2-jdk_net, \
1.111 - solaris_i586_5.10-product-c1-jdk_net, \
1.112 - solaris_x64_5.10-product-c2-jdk_net, \
1.113 - linux_i586_2.6-product-{c1|c2}-jdk_net, \
1.114 - linux_x64_2.6-product-c2-jdk_net, \
1.115 - windows_i586_5.1-product-c1-jdk_net, \
1.116 - windows_x64_5.2-product-c2-jdk_net, \
1.117 - \
1.118 - solaris_sparc_5.10-product-c1-jdk_nio1, \
1.119 - solaris_sparcv9_5.10-product-c2-jdk_nio1, \
1.120 - solaris_i586_5.10-product-c1-jdk_nio1, \
1.121 - solaris_x64_5.10-product-c2-jdk_nio1, \
1.122 - linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
1.123 - linux_x64_2.6-product-c2-jdk_nio1, \
1.124 - windows_i586_5.1-product-c1-jdk_nio1, \
1.125 - windows_x64_5.2-product-c2-jdk_nio1, \
1.126 - \
1.127 - solaris_sparc_5.10-product-c1-jdk_nio2, \
1.128 - solaris_sparcv9_5.10-product-c2-jdk_nio2, \
1.129 - solaris_i586_5.10-product-c1-jdk_nio2, \
1.130 - solaris_x64_5.10-product-c2-jdk_nio2, \
1.131 - linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
1.132 - linux_x64_2.6-product-c2-jdk_nio2, \
1.133 - windows_i586_5.1-product-c1-jdk_nio2, \
1.134 - windows_x64_5.2-product-c2-jdk_nio2, \
1.135 - \
1.136 - solaris_sparc_5.10-product-c1-jdk_nio3, \
1.137 - solaris_sparcv9_5.10-product-c2-jdk_nio3, \
1.138 - solaris_i586_5.10-product-c1-jdk_nio3, \
1.139 - solaris_x64_5.10-product-c2-jdk_nio3, \
1.140 - linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
1.141 - linux_x64_2.6-product-c2-jdk_nio3, \
1.142 - windows_i586_5.1-product-c1-jdk_nio3, \
1.143 - windows_x64_5.2-product-c2-jdk_nio3, \
1.144 - \
1.145 - solaris_sparc_5.10-product-c1-jdk_security1, \
1.146 - solaris_sparcv9_5.10-product-c2-jdk_security1, \
1.147 - solaris_i586_5.10-product-c1-jdk_security1, \
1.148 - solaris_x64_5.10-product-c2-jdk_security1, \
1.149 - linux_i586_2.6-product-{c1|c2}-jdk_security1, \
1.150 - linux_x64_2.6-product-c2-jdk_security1, \
1.151 - windows_i586_5.1-product-c1-jdk_security1, \
1.152 - windows_x64_5.2-product-c2-jdk_security1, \
1.153 - \
1.154 - solaris_sparc_5.10-product-c1-jdk_text, \
1.155 - solaris_sparcv9_5.10-product-c2-jdk_text, \
1.156 - solaris_i586_5.10-product-c1-jdk_text, \
1.157 - solaris_x64_5.10-product-c2-jdk_text, \
1.158 - linux_i586_2.6-product-{c1|c2}-jdk_text, \
1.159 - linux_x64_2.6-product-c2-jdk_text, \
1.160 - windows_i586_5.1-product-c1-jdk_text, \
1.161 - windows_x64_5.2-product-c2-jdk_text, \
1.162 - \
1.163 - solaris_sparc_5.10-product-c1-jdk_tools1, \
1.164 - solaris_sparcv9_5.10-product-c2-jdk_tools1, \
1.165 - solaris_i586_5.10-product-c1-jdk_tools1, \
1.166 - solaris_x64_5.10-product-c2-jdk_tools1, \
1.167 - linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
1.168 - linux_x64_2.6-product-c2-jdk_tools1, \
1.169 - windows_i586_5.1-product-c1-jdk_tools1, \
1.170 - windows_x64_5.2-product-c2-jdk_tools1, \
1.171 - \
1.172 - solaris_sparc_5.10-product-c1-jdk_util, \
1.173 - solaris_sparcv9_5.10-product-c2-jdk_util, \
1.174 - solaris_i586_5.10-product-c1-jdk_util, \
1.175 - solaris_x64_5.10-product-c2-jdk_util, \
1.176 - linux_i586_2.6-product-{c1|c2}-jdk_util, \
1.177 - linux_x64_2.6-product-c2-jdk_util, \
1.178 - windows_i586_5.1-product-c1-jdk_util, \
1.179 - windows_x64_5.2-product-c2-jdk_util
1.180 + ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
1.181 + ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
1.182 + ${jprt.my.test.target.set:TESTNAME=jdk_io}, \
1.183 + ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
1.184 + ${jprt.my.test.target.set:TESTNAME=jdk_math}, \
1.185 + ${jprt.my.test.target.set:TESTNAME=jdk_misc}, \
1.186 + ${jprt.my.test.target.set:TESTNAME=jdk_net}, \
1.187 + ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
1.188 + ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
1.189 + ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
1.190 + ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
1.191 + ${jprt.my.test.target.set:TESTNAME=jdk_text}, \
1.192 + ${jprt.my.test.target.set:TESTNAME=jdk_util}
1.193
1.194 -# All vm test targets (but still no fastdebug & limited c2 testing)
1.195 +# All vm test targets (testset=all)
1.196 jprt.vm.all.test.targets= \
1.197 - \
1.198 - ${jprt.vm.default.test.targets}, \
1.199 - \
1.200 - solaris_sparc_5.10-product-c1-runThese, \
1.201 - solaris_sparcv9_5.10-product-c2-runThese, \
1.202 - solaris_i586_5.10-product-c1-runThese, \
1.203 - solaris_x64_5.10-product-c2-runThese, \
1.204 - linux_i586_2.6-product-{c1|c2}-runThese, \
1.205 - linux_x64_2.6-product-c2-runThese, \
1.206 - windows_i586_5.1-product-c1-runThese, \
1.207 - windows_x64_5.2-product-c2-runThese, \
1.208 - \
1.209 - solaris_sparc_5.10-product-c1-jbb_default, \
1.210 - solaris_sparcv9_5.10-product-c2-jbb_default, \
1.211 - solaris_i586_5.10-product-c1-jbb_default, \
1.212 - solaris_x64_5.10-product-c2-jbb_default, \
1.213 - linux_i586_2.6-product-{c1|c2}-jbb_default, \
1.214 - linux_x64_2.6-product-c2-jbb_default, \
1.215 - windows_i586_5.1-product-c1-jbb_default, \
1.216 - windows_x64_5.2-product-c2-jbb_default
1.217 + ${jprt.vm.default.test.targets}, \
1.218 + ${jprt.my.test.target.set:TESTNAME=runThese}, \
1.219 + ${jprt.my.test.target.set:TESTNAME=jbb_default}
1.220
1.221 -# All jdk test targets (but still no fastdebug & limited c2 testing)
1.222 +# All jdk test targets (testset=all)
1.223 jprt.make.rule.all.test.targets= \
1.224 - \
1.225 - ${jprt.make.rule.default.test.targets}, \
1.226 - \
1.227 - solaris_sparc_5.10-product-c1-jdk_awt, \
1.228 - solaris_sparcv9_5.10-product-c2-jdk_awt, \
1.229 - solaris_i586_5.10-product-c1-jdk_awt, \
1.230 - solaris_x64_5.10-product-c2-jdk_awt, \
1.231 - linux_i586_2.6-product-{c1|c2}-jdk_awt, \
1.232 - linux_x64_2.6-product-c2-jdk_awt, \
1.233 - windows_i586_5.1-product-c1-jdk_awt, \
1.234 - windows_x64_5.2-product-c2-jdk_awt, \
1.235 - \
1.236 - solaris_sparc_5.10-product-c1-jdk_beans2, \
1.237 - solaris_sparcv9_5.10-product-c2-jdk_beans2, \
1.238 - solaris_i586_5.10-product-c1-jdk_beans2, \
1.239 - solaris_x64_5.10-product-c2-jdk_beans2, \
1.240 - linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
1.241 - linux_x64_2.6-product-c2-jdk_beans2, \
1.242 - windows_i586_5.1-product-c1-jdk_beans2, \
1.243 - windows_x64_5.2-product-c2-jdk_beans2, \
1.244 - \
1.245 - solaris_sparc_5.10-product-c1-jdk_beans3, \
1.246 - solaris_sparcv9_5.10-product-c2-jdk_beans3, \
1.247 - solaris_i586_5.10-product-c1-jdk_beans3, \
1.248 - solaris_x64_5.10-product-c2-jdk_beans3, \
1.249 - linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
1.250 - linux_x64_2.6-product-c2-jdk_beans3, \
1.251 - windows_i586_5.1-product-c1-jdk_beans3, \
1.252 - windows_x64_5.2-product-c2-jdk_beans3, \
1.253 - \
1.254 - solaris_sparc_5.10-product-c1-jdk_management1, \
1.255 - solaris_sparcv9_5.10-product-c2-jdk_management1, \
1.256 - solaris_i586_5.10-product-c1-jdk_management1, \
1.257 - solaris_x64_5.10-product-c2-jdk_management1, \
1.258 - linux_i586_2.6-product-{c1|c2}-jdk_management1, \
1.259 - linux_x64_2.6-product-c2-jdk_management1, \
1.260 - windows_i586_5.1-product-c1-jdk_management1, \
1.261 - windows_x64_5.2-product-c2-jdk_management1, \
1.262 - \
1.263 - solaris_sparc_5.10-product-c1-jdk_management2, \
1.264 - solaris_sparcv9_5.10-product-c2-jdk_management2, \
1.265 - solaris_i586_5.10-product-c1-jdk_management2, \
1.266 - solaris_x64_5.10-product-c2-jdk_management2, \
1.267 - linux_i586_2.6-product-{c1|c2}-jdk_management2, \
1.268 - linux_x64_2.6-product-c2-jdk_management2, \
1.269 - windows_i586_5.1-product-c1-jdk_management2, \
1.270 - windows_x64_5.2-product-c2-jdk_management2, \
1.271 - \
1.272 - solaris_sparc_5.10-product-c1-jdk_rmi, \
1.273 - solaris_sparcv9_5.10-product-c2-jdk_rmi, \
1.274 - solaris_i586_5.10-product-c1-jdk_rmi, \
1.275 - solaris_x64_5.10-product-c2-jdk_rmi, \
1.276 - linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
1.277 - linux_x64_2.6-product-c2-jdk_rmi, \
1.278 - windows_i586_5.1-product-c1-jdk_rmi, \
1.279 - windows_x64_5.2-product-c2-jdk_rmi, \
1.280 - \
1.281 - solaris_sparc_5.10-product-c1-jdk_security2, \
1.282 - solaris_sparcv9_5.10-product-c2-jdk_security2, \
1.283 - solaris_i586_5.10-product-c1-jdk_security2, \
1.284 - solaris_x64_5.10-product-c2-jdk_security2, \
1.285 - linux_i586_2.6-product-{c1|c2}-jdk_security2, \
1.286 - linux_x64_2.6-product-c2-jdk_security2, \
1.287 - windows_i586_5.1-product-c1-jdk_security2, \
1.288 - windows_x64_5.2-product-c2-jdk_security2, \
1.289 - \
1.290 - solaris_sparc_5.10-product-c1-jdk_security3, \
1.291 - solaris_sparcv9_5.10-product-c2-jdk_security3, \
1.292 - solaris_i586_5.10-product-c1-jdk_security3, \
1.293 - solaris_x64_5.10-product-c2-jdk_security3, \
1.294 - linux_i586_2.6-product-{c1|c2}-jdk_security3, \
1.295 - linux_x64_2.6-product-c2-jdk_security3, \
1.296 - windows_i586_5.1-product-c1-jdk_security3, \
1.297 - windows_x64_5.2-product-c2-jdk_security3, \
1.298 - \
1.299 - solaris_sparc_5.10-product-c1-jdk_sound, \
1.300 - solaris_sparcv9_5.10-product-c2-jdk_sound, \
1.301 - solaris_i586_5.10-product-c1-jdk_sound, \
1.302 - solaris_x64_5.10-product-c2-jdk_sound, \
1.303 - linux_i586_2.6-product-{c1|c2}-jdk_sound, \
1.304 - linux_x64_2.6-product-c2-jdk_sound, \
1.305 - windows_i586_5.1-product-c1-jdk_sound, \
1.306 - windows_x64_5.2-product-c2-jdk_sound, \
1.307 - \
1.308 - solaris_sparc_5.10-product-c1-jdk_swing, \
1.309 - solaris_sparcv9_5.10-product-c2-jdk_swing, \
1.310 - solaris_i586_5.10-product-c1-jdk_swing, \
1.311 - solaris_x64_5.10-product-c2-jdk_swing, \
1.312 - linux_i586_2.6-product-{c1|c2}-jdk_swing, \
1.313 - linux_x64_2.6-product-c2-jdk_swing, \
1.314 - windows_i586_5.1-product-c1-jdk_swing, \
1.315 - windows_x64_5.2-product-c2-jdk_swing, \
1.316 - \
1.317 - solaris_sparc_5.10-product-c1-jdk_tools2, \
1.318 - solaris_sparcv9_5.10-product-c2-jdk_tools2, \
1.319 - solaris_i586_5.10-product-c1-jdk_tools2, \
1.320 - solaris_x64_5.10-product-c2-jdk_tools2, \
1.321 - linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
1.322 - linux_x64_2.6-product-c2-jdk_tools2, \
1.323 - windows_i586_5.1-product-c1-jdk_tools2, \
1.324 - windows_x64_5.2-product-c2-jdk_tools2
1.325 + ${jprt.make.rule.default.test.targets}, \
1.326 + ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
1.327 + ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
1.328 + ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
1.329 + ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
1.330 + ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
1.331 + ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
1.332 + ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
1.333 + ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
1.334 + ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
1.335 + ${jprt.my.test.target.set:TESTNAME=jdk_swing}, \
1.336 + ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
1.337 + ${jprt.my.test.target.set:TESTNAME=jdk_tools2}
1.338
1.339 -# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
1.340 +# JCK test targets in test/Makefile (no windows)
1.341 jprt.my.jck.test.target.set= \
1.342 solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
1.343 solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
1.344 @@ -338,11 +115,10 @@
1.345 ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
1.346
1.347 # Select list to use (allow for testset to be empty too)
1.348 -jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
1.349 -jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
1.350 -jprt.vm..test.targets=${jprt.vm.default.test.targets}
1.351 -jprt.vm.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
1.352 -jprt.test.targets=${jprt.vm.test.targets}
1.353 +jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
1.354 +jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
1.355 +jprt.vm..test.targets=${jprt.vm.default.test.targets}
1.356 +jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
1.357
1.358 # Directories to be excluded from the source bundles
1.359 jprt.bundle.exclude.src.dirs=build dist webrev
