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