Mon, 18 Oct 2010 11:13:35 -0400
Merge
1.1 --- a/.hgtags Tue Oct 12 13:29:44 2010 -0400 1.2 +++ b/.hgtags Mon Oct 18 11:13:35 2010 -0400 1.3 @@ -88,3 +88,4 @@ 1.4 9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111 1.5 b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112 1.6 c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113 1.7 +27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
2.1 --- a/Makefile Tue Oct 12 13:29:44 2010 -0400 2.2 +++ b/Makefile Mon Oct 18 11:13:35 2010 -0400 2.3 @@ -558,9 +558,12 @@ 2.4 # rule to test 2.5 ################################################################ 2.6 2.7 -.NOTPARALLEL: test 2.8 +.NOTPARALLEL: test_run 2.9 2.10 -test: test_clean test_start test_summary 2.11 +test: 2.12 + $(MAKE) test_run 2.13 + 2.14 +test_run: test_clean test_start test_summary 2.15 2.16 test_start: 2.17 @$(ECHO) "Tests started at `$(DATE)`" 2.18 @@ -586,7 +589,7 @@ 2.19 # Get failure list from log 2.20 $(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt 2.21 @$(RM) $@ 2.22 - @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@ 2.23 + @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@ 2.24 2.25 # Get log file of all tests run 2.26 JDK_TO_TEST := $(shell \ 2.27 @@ -598,10 +601,11 @@ 2.28 $(ECHO) "$(PRODUCT_HOME)"; \ 2.29 fi \ 2.30 ) 2.31 +TEST_TARGETS=all 2.32 $(OUTPUTDIR)/test_log.txt: 2.33 $(RM) $@ 2.34 - ( $(CD) test && \ 2.35 - $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \ 2.36 + ( $(CD) test && \ 2.37 + $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \ 2.38 ) | tee $@ 2.39 2.40 ################################################################ 2.41 @@ -614,7 +618,7 @@ 2.42 # PHONY 2.43 ################################################################ 2.44 2.45 -.PHONY: all test test_start test_summary test_clean \ 2.46 +.PHONY: all test test_run test_start test_summary test_clean \ 2.47 generic_build_repo_series \ 2.48 what clobber insane \ 2.49 dev dev-build dev-sanity dev-clobber \
3.1 --- a/make/jprt.properties Tue Oct 12 13:29:44 2010 -0400 3.2 +++ b/make/jprt.properties Mon Oct 18 11:13:35 2010 -0400 3.3 @@ -25,49 +25,310 @@ 3.4 3.5 # Properties for jprt 3.6 3.7 -# Use whatever release that the submitted job requests 3.8 +# At submit time, the release supplied will be in jprt.submit.release 3.9 +# and will be one of the official release names defined in jprt. 3.10 +# jprt supports property value expansion using ${property.name} syntax. 3.11 + 3.12 +# This tells jprt what default release we want to build 3.13 jprt.tools.default.release=${jprt.submit.release} 3.14 3.15 # The different build flavors we want, we override here so we just get these 2 3.16 jprt.build.flavors=product,fastdebug 3.17 3.18 -# Shortened list of vm tests 3.19 -jprt.test.targets= \ 3.20 - *-product-*-jvm98, \ 3.21 - *-product-*-scimark, \ 3.22 - *-product-*-runThese, \ 3.23 - *-product-*-GCBasher_default, \ 3.24 - *-product-*-GCOld_default, \ 3.25 - *-product-*-jbb_default 3.26 +# Define the Windows we want (temporary) 3.27 +jprt.my.windows.i586.jdk7b107=windows_i586_5.0 3.28 +jprt.my.windows.i586.jdk7temp=windows_i586_5.0 3.29 +jprt.my.windows.i586.jdk7=windows_i586_5.1 3.30 +jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} 3.31 3.32 -# Test targets in test/Makefile 3.33 -jprt.make.rule.test.targets= \ 3.34 - *-product-*-langtools_jtreg, \ 3.35 - *-product-*-jdk_beans1, \ 3.36 - *-product-*-jdk_beans2, \ 3.37 - *-product-*-jdk_beans3, \ 3.38 - *-product-*-jdk_io, \ 3.39 - *-product-*-jdk_lang, \ 3.40 - *-product-*-jdk_management1, \ 3.41 - *-product-*-jdk_management2, \ 3.42 - *-product-*-jdk_math, \ 3.43 - *-product-*-jdk_misc, \ 3.44 - *-product-*-jdk_net, \ 3.45 - *-product-*-jdk_nio1, \ 3.46 - *-product-*-jdk_nio2, \ 3.47 - *-product-*-jdk_nio3, \ 3.48 - *-product-*-jdk_security1, \ 3.49 - *-product-*-jdk_security2, \ 3.50 - *-product-*-jdk_security3, \ 3.51 - *-product-*-jdk_text, \ 3.52 - *-product-*-jdk_tools1, \ 3.53 - *-product-*-jdk_tools2, \ 3.54 - *-product-*-jdk_util 3.55 +# Standard list of jprt build targets for this source tree 3.56 +jprt.build.targets= \ 3.57 + solaris_sparc_5.10-{product|fastdebug}, \ 3.58 + solaris_sparcv9_5.10-{product|fastdebug}, \ 3.59 + solaris_i586_5.10-{product|fastdebug}, \ 3.60 + solaris_x64_5.10-{product|fastdebug}, \ 3.61 + linux_i586_2.6-{product|fastdebug}, \ 3.62 + linux_x64_2.6-{product|fastdebug}, \ 3.63 + ${jprt.my.windows.i586}-{product|fastdebug}, \ 3.64 + windows_x64_5.2-{product|fastdebug} 3.65 3.66 -# Not Ready Yet: 3.67 -# *-product-*-jdk_awt 3.68 -# *-product-*-jdk_rmi 3.69 -# *-product-*-jdk_swing 3.70 +# User can select the test set with jprt submit "-testset name" option 3.71 +jprt.my.test.set=${jprt.test.set} 3.72 + 3.73 +# Default vm test targets (no fastdebug & limited c2 testing) 3.74 +jprt.vm.default.test.targets= \ 3.75 + \ 3.76 + solaris_sparc_5.10-product-c1-jvm98, \ 3.77 + solaris_sparcv9_5.10-product-c2-jvm98, \ 3.78 + solaris_i586_5.10-product-c1-jvm98, \ 3.79 + solaris_x64_5.10-product-c2-jvm98, \ 3.80 + linux_i586_2.6-product-{c1|c2}-jvm98, \ 3.81 + linux_x64_2.6-product-c2-jvm98, \ 3.82 + ${jprt.my.windows.i586}-product-c1-jvm98, \ 3.83 + windows_x64_5.2-product-c2-jvm98, \ 3.84 + \ 3.85 + solaris_sparc_5.10-product-c1-scimark, \ 3.86 + solaris_sparcv9_5.10-product-c2-scimark, \ 3.87 + solaris_i586_5.10-product-c1-scimark, \ 3.88 + solaris_x64_5.10-product-c2-scimark, \ 3.89 + linux_i586_2.6-product-{c1|c2}-scimark, \ 3.90 + linux_x64_2.6-product-c2-scimark, \ 3.91 + ${jprt.my.windows.i586}-product-c1-scimark, \ 3.92 + windows_x64_5.2-product-c2-scimark 3.93 + 3.94 +# Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing) 3.95 +jprt.make.rule.default.test.targets= \ 3.96 + \ 3.97 + solaris_sparc_5.10-product-c1-langtools_jtreg, \ 3.98 + solaris_sparcv9_5.10-product-c2-langtools_jtreg, \ 3.99 + solaris_i586_5.10-product-c1-langtools_jtreg, \ 3.100 + solaris_x64_5.10-product-c2-langtools_jtreg, \ 3.101 + linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \ 3.102 + linux_x64_2.6-product-c2-langtools_jtreg, \ 3.103 + ${jprt.my.windows.i586}-product-c1-langtools_jtreg, \ 3.104 + windows_x64_5.2-product-c2-langtools_jtreg, \ 3.105 + \ 3.106 + solaris_sparc_5.10-product-c1-jdk_beans1, \ 3.107 + solaris_sparcv9_5.10-product-c2-jdk_beans1, \ 3.108 + solaris_i586_5.10-product-c1-jdk_beans1, \ 3.109 + solaris_x64_5.10-product-c2-jdk_beans1, \ 3.110 + linux_i586_2.6-product-{c1|c2}-jdk_beans1, \ 3.111 + linux_x64_2.6-product-c2-jdk_beans1, \ 3.112 + ${jprt.my.windows.i586}-product-c1-jdk_beans1, \ 3.113 + windows_x64_5.2-product-c2-jdk_beans1, \ 3.114 + \ 3.115 + solaris_sparc_5.10-product-c1-jdk_io, \ 3.116 + solaris_sparcv9_5.10-product-c2-jdk_io, \ 3.117 + solaris_i586_5.10-product-c1-jdk_io, \ 3.118 + solaris_x64_5.10-product-c2-jdk_io, \ 3.119 + linux_i586_2.6-product-{c1|c2}-jdk_io, \ 3.120 + linux_x64_2.6-product-c2-jdk_io, \ 3.121 + ${jprt.my.windows.i586}-product-c1-jdk_io, \ 3.122 + windows_x64_5.2-product-c2-jdk_io, \ 3.123 + \ 3.124 + solaris_sparc_5.10-product-c1-jdk_lang, \ 3.125 + solaris_sparcv9_5.10-product-c2-jdk_lang, \ 3.126 + solaris_i586_5.10-product-c1-jdk_lang, \ 3.127 + solaris_x64_5.10-product-c2-jdk_lang, \ 3.128 + linux_i586_2.6-product-{c1|c2}-jdk_lang, \ 3.129 + linux_x64_2.6-product-c2-jdk_lang, \ 3.130 + ${jprt.my.windows.i586}-product-c1-jdk_lang, \ 3.131 + windows_x64_5.2-product-c2-jdk_lang, \ 3.132 + \ 3.133 + solaris_sparc_5.10-product-c1-jdk_math, \ 3.134 + solaris_sparcv9_5.10-product-c2-jdk_math, \ 3.135 + solaris_i586_5.10-product-c1-jdk_math, \ 3.136 + solaris_x64_5.10-product-c2-jdk_math, \ 3.137 + linux_i586_2.6-product-{c1|c2}-jdk_math, \ 3.138 + linux_x64_2.6-product-c2-jdk_math, \ 3.139 + ${jprt.my.windows.i586}-product-c1-jdk_math, \ 3.140 + windows_x64_5.2-product-c2-jdk_math, \ 3.141 + \ 3.142 + solaris_sparc_5.10-product-c1-jdk_misc, \ 3.143 + solaris_sparcv9_5.10-product-c2-jdk_misc, \ 3.144 + solaris_i586_5.10-product-c1-jdk_misc, \ 3.145 + solaris_x64_5.10-product-c2-jdk_misc, \ 3.146 + linux_i586_2.6-product-{c1|c2}-jdk_misc, \ 3.147 + linux_x64_2.6-product-c2-jdk_misc, \ 3.148 + ${jprt.my.windows.i586}-product-c1-jdk_misc, \ 3.149 + windows_x64_5.2-product-c2-jdk_misc, \ 3.150 + \ 3.151 + solaris_sparc_5.10-product-c1-jdk_net, \ 3.152 + solaris_sparcv9_5.10-product-c2-jdk_net, \ 3.153 + solaris_i586_5.10-product-c1-jdk_net, \ 3.154 + solaris_x64_5.10-product-c2-jdk_net, \ 3.155 + linux_i586_2.6-product-{c1|c2}-jdk_net, \ 3.156 + linux_x64_2.6-product-c2-jdk_net, \ 3.157 + ${jprt.my.windows.i586}-product-c1-jdk_net, \ 3.158 + windows_x64_5.2-product-c2-jdk_net, \ 3.159 + \ 3.160 + solaris_sparc_5.10-product-c1-jdk_nio1, \ 3.161 + solaris_sparcv9_5.10-product-c2-jdk_nio1, \ 3.162 + solaris_i586_5.10-product-c1-jdk_nio1, \ 3.163 + solaris_x64_5.10-product-c2-jdk_nio1, \ 3.164 + linux_i586_2.6-product-{c1|c2}-jdk_nio1, \ 3.165 + linux_x64_2.6-product-c2-jdk_nio1, \ 3.166 + ${jprt.my.windows.i586}-product-c1-jdk_nio1, \ 3.167 + windows_x64_5.2-product-c2-jdk_nio1, \ 3.168 + \ 3.169 + solaris_sparc_5.10-product-c1-jdk_nio2, \ 3.170 + solaris_sparcv9_5.10-product-c2-jdk_nio2, \ 3.171 + solaris_i586_5.10-product-c1-jdk_nio2, \ 3.172 + solaris_x64_5.10-product-c2-jdk_nio2, \ 3.173 + linux_i586_2.6-product-{c1|c2}-jdk_nio2, \ 3.174 + linux_x64_2.6-product-c2-jdk_nio2, \ 3.175 + ${jprt.my.windows.i586}-product-c1-jdk_nio2, \ 3.176 + windows_x64_5.2-product-c2-jdk_nio2, \ 3.177 + \ 3.178 + solaris_sparc_5.10-product-c1-jdk_nio3, \ 3.179 + solaris_sparcv9_5.10-product-c2-jdk_nio3, \ 3.180 + solaris_i586_5.10-product-c1-jdk_nio3, \ 3.181 + solaris_x64_5.10-product-c2-jdk_nio3, \ 3.182 + linux_i586_2.6-product-{c1|c2}-jdk_nio3, \ 3.183 + linux_x64_2.6-product-c2-jdk_nio3, \ 3.184 + ${jprt.my.windows.i586}-product-c1-jdk_nio3, \ 3.185 + windows_x64_5.2-product-c2-jdk_nio3, \ 3.186 + \ 3.187 + solaris_sparc_5.10-product-c1-jdk_security1, \ 3.188 + solaris_sparcv9_5.10-product-c2-jdk_security1, \ 3.189 + solaris_i586_5.10-product-c1-jdk_security1, \ 3.190 + solaris_x64_5.10-product-c2-jdk_security1, \ 3.191 + linux_i586_2.6-product-{c1|c2}-jdk_security1, \ 3.192 + linux_x64_2.6-product-c2-jdk_security1, \ 3.193 + ${jprt.my.windows.i586}-product-c1-jdk_security1, \ 3.194 + windows_x64_5.2-product-c2-jdk_security1, \ 3.195 + \ 3.196 + solaris_sparc_5.10-product-c1-jdk_text, \ 3.197 + solaris_sparcv9_5.10-product-c2-jdk_text, \ 3.198 + solaris_i586_5.10-product-c1-jdk_text, \ 3.199 + solaris_x64_5.10-product-c2-jdk_text, \ 3.200 + linux_i586_2.6-product-{c1|c2}-jdk_text, \ 3.201 + linux_x64_2.6-product-c2-jdk_text, \ 3.202 + ${jprt.my.windows.i586}-product-c1-jdk_text, \ 3.203 + windows_x64_5.2-product-c2-jdk_text, \ 3.204 + \ 3.205 + solaris_sparc_5.10-product-c1-jdk_tools1, \ 3.206 + solaris_sparcv9_5.10-product-c2-jdk_tools1, \ 3.207 + solaris_i586_5.10-product-c1-jdk_tools1, \ 3.208 + solaris_x64_5.10-product-c2-jdk_tools1, \ 3.209 + linux_i586_2.6-product-{c1|c2}-jdk_tools1, \ 3.210 + linux_x64_2.6-product-c2-jdk_tools1, \ 3.211 + ${jprt.my.windows.i586}-product-c1-jdk_tools1, \ 3.212 + windows_x64_5.2-product-c2-jdk_tools1, \ 3.213 + \ 3.214 + solaris_sparc_5.10-product-c1-jdk_util, \ 3.215 + solaris_sparcv9_5.10-product-c2-jdk_util, \ 3.216 + solaris_i586_5.10-product-c1-jdk_util, \ 3.217 + solaris_x64_5.10-product-c2-jdk_util, \ 3.218 + linux_i586_2.6-product-{c1|c2}-jdk_util, \ 3.219 + linux_x64_2.6-product-c2-jdk_util, \ 3.220 + ${jprt.my.windows.i586}-product-c1-jdk_util, \ 3.221 + windows_x64_5.2-product-c2-jdk_util 3.222 + 3.223 +# All vm test targets (but still no fastdebug & limited c2 testing) 3.224 +jprt.vm.all.test.targets= \ 3.225 + \ 3.226 + ${jprt.vm.default.test.targets}, \ 3.227 + \ 3.228 + solaris_sparc_5.10-product-c1-runThese, \ 3.229 + solaris_sparcv9_5.10-product-c2-runThese, \ 3.230 + solaris_i586_5.10-product-c1-runThese, \ 3.231 + solaris_x64_5.10-product-c2-runThese, \ 3.232 + linux_i586_2.6-product-{c1|c2}-runThese, \ 3.233 + linux_x64_2.6-product-c2-runThese, \ 3.234 + ${jprt.my.windows.i586}-product-c1-runThese, \ 3.235 + windows_x64_5.2-product-c2-runThese, \ 3.236 + \ 3.237 + solaris_sparc_5.10-product-c1-jbb_default, \ 3.238 + solaris_sparcv9_5.10-product-c2-jbb_default, \ 3.239 + solaris_i586_5.10-product-c1-jbb_default, \ 3.240 + solaris_x64_5.10-product-c2-jbb_default, \ 3.241 + linux_i586_2.6-product-{c1|c2}-jbb_default, \ 3.242 + linux_x64_2.6-product-c2-jbb_default, \ 3.243 + ${jprt.my.windows.i586}-product-c1-jbb_default, \ 3.244 + windows_x64_5.2-product-c2-jbb_default 3.245 + 3.246 +# All jdk test targets (but still no fastdebug & limited c2 testing) 3.247 +jprt.make.rule.all.test.targets= \ 3.248 + \ 3.249 + ${jprt.make.rule.default.test.targets}, \ 3.250 + \ 3.251 + solaris_sparc_5.10-product-c1-jdk_awt, \ 3.252 + solaris_sparcv9_5.10-product-c2-jdk_awt, \ 3.253 + solaris_i586_5.10-product-c1-jdk_awt, \ 3.254 + solaris_x64_5.10-product-c2-jdk_awt, \ 3.255 + linux_i586_2.6-product-{c1|c2}-jdk_awt, \ 3.256 + linux_x64_2.6-product-c2-jdk_awt, \ 3.257 + ${jprt.my.windows.i586}-product-c1-jdk_awt, \ 3.258 + windows_x64_5.2-product-c2-jdk_awt, \ 3.259 + \ 3.260 + solaris_sparc_5.10-product-c1-jdk_beans2, \ 3.261 + solaris_sparcv9_5.10-product-c2-jdk_beans2, \ 3.262 + solaris_i586_5.10-product-c1-jdk_beans2, \ 3.263 + solaris_x64_5.10-product-c2-jdk_beans2, \ 3.264 + linux_i586_2.6-product-{c1|c2}-jdk_beans2, \ 3.265 + linux_x64_2.6-product-c2-jdk_beans2, \ 3.266 + ${jprt.my.windows.i586}-product-c1-jdk_beans2, \ 3.267 + windows_x64_5.2-product-c2-jdk_beans2, \ 3.268 + \ 3.269 + solaris_sparc_5.10-product-c1-jdk_beans3, \ 3.270 + solaris_sparcv9_5.10-product-c2-jdk_beans3, \ 3.271 + solaris_i586_5.10-product-c1-jdk_beans3, \ 3.272 + solaris_x64_5.10-product-c2-jdk_beans3, \ 3.273 + linux_i586_2.6-product-{c1|c2}-jdk_beans3, \ 3.274 + linux_x64_2.6-product-c2-jdk_beans3, \ 3.275 + ${jprt.my.windows.i586}-product-c1-jdk_beans3, \ 3.276 + windows_x64_5.2-product-c2-jdk_beans3, \ 3.277 + \ 3.278 + solaris_sparc_5.10-product-c1-jdk_management1, \ 3.279 + solaris_sparcv9_5.10-product-c2-jdk_management1, \ 3.280 + solaris_i586_5.10-product-c1-jdk_management1, \ 3.281 + solaris_x64_5.10-product-c2-jdk_management1, \ 3.282 + linux_i586_2.6-product-{c1|c2}-jdk_management1, \ 3.283 + linux_x64_2.6-product-c2-jdk_management1, \ 3.284 + ${jprt.my.windows.i586}-product-c1-jdk_management1, \ 3.285 + windows_x64_5.2-product-c2-jdk_management1, \ 3.286 + \ 3.287 + solaris_sparc_5.10-product-c1-jdk_management2, \ 3.288 + solaris_sparcv9_5.10-product-c2-jdk_management2, \ 3.289 + solaris_i586_5.10-product-c1-jdk_management2, \ 3.290 + solaris_x64_5.10-product-c2-jdk_management2, \ 3.291 + linux_i586_2.6-product-{c1|c2}-jdk_management2, \ 3.292 + linux_x64_2.6-product-c2-jdk_management2, \ 3.293 + ${jprt.my.windows.i586}-product-c1-jdk_management2, \ 3.294 + windows_x64_5.2-product-c2-jdk_management2, \ 3.295 + \ 3.296 + solaris_sparc_5.10-product-c1-jdk_rmi, \ 3.297 + solaris_sparcv9_5.10-product-c2-jdk_rmi, \ 3.298 + solaris_i586_5.10-product-c1-jdk_rmi, \ 3.299 + solaris_x64_5.10-product-c2-jdk_rmi, \ 3.300 + linux_i586_2.6-product-{c1|c2}-jdk_rmi, \ 3.301 + linux_x64_2.6-product-c2-jdk_rmi, \ 3.302 + ${jprt.my.windows.i586}-product-c1-jdk_rmi, \ 3.303 + windows_x64_5.2-product-c2-jdk_rmi, \ 3.304 + \ 3.305 + solaris_sparc_5.10-product-c1-jdk_security2, \ 3.306 + solaris_sparcv9_5.10-product-c2-jdk_security2, \ 3.307 + solaris_i586_5.10-product-c1-jdk_security2, \ 3.308 + solaris_x64_5.10-product-c2-jdk_security2, \ 3.309 + linux_i586_2.6-product-{c1|c2}-jdk_security2, \ 3.310 + linux_x64_2.6-product-c2-jdk_security2, \ 3.311 + ${jprt.my.windows.i586}-product-c1-jdk_security2, \ 3.312 + windows_x64_5.2-product-c2-jdk_security2, \ 3.313 + \ 3.314 + solaris_sparc_5.10-product-c1-jdk_security3, \ 3.315 + solaris_sparcv9_5.10-product-c2-jdk_security3, \ 3.316 + solaris_i586_5.10-product-c1-jdk_security3, \ 3.317 + solaris_x64_5.10-product-c2-jdk_security3, \ 3.318 + linux_i586_2.6-product-{c1|c2}-jdk_security3, \ 3.319 + linux_x64_2.6-product-c2-jdk_security3, \ 3.320 + ${jprt.my.windows.i586}-product-c1-jdk_security3, \ 3.321 + windows_x64_5.2-product-c2-jdk_security3, \ 3.322 + \ 3.323 + solaris_sparc_5.10-product-c1-jdk_swing, \ 3.324 + solaris_sparcv9_5.10-product-c2-jdk_swing, \ 3.325 + solaris_i586_5.10-product-c1-jdk_swing, \ 3.326 + solaris_x64_5.10-product-c2-jdk_swing, \ 3.327 + linux_i586_2.6-product-{c1|c2}-jdk_swing, \ 3.328 + linux_x64_2.6-product-c2-jdk_swing, \ 3.329 + ${jprt.my.windows.i586}-product-c1-jdk_swing, \ 3.330 + windows_x64_5.2-product-c2-jdk_swing, \ 3.331 + \ 3.332 + solaris_sparc_5.10-product-c1-jdk_tools2, \ 3.333 + solaris_sparcv9_5.10-product-c2-jdk_tools2, \ 3.334 + solaris_i586_5.10-product-c1-jdk_tools2, \ 3.335 + solaris_x64_5.10-product-c2-jdk_tools2, \ 3.336 + linux_i586_2.6-product-{c1|c2}-jdk_tools2, \ 3.337 + linux_x64_2.6-product-c2-jdk_tools2, \ 3.338 + ${jprt.my.windows.i586}-product-c1-jdk_tools2, \ 3.339 + windows_x64_5.2-product-c2-jdk_tools2 3.340 + 3.341 +# Select list to use (allow for testset to be empty too) 3.342 +jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets} 3.343 +jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets} 3.344 +jprt.vm..test.targets=${jprt.vm.default.test.targets} 3.345 +jprt.vm.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets} 3.346 +jprt.test.targets=${jprt.vm.test.targets} 3.347 3.348 # Directories to be excluded from the source bundles 3.349 jprt.bundle.exclude.src.dirs=build dist webrev