6703308: Fix jprt.properties to allow for jdk6 and jdk7 builds

Wed, 28 May 2008 10:16:33 -0700

author
ohair
date
Wed, 28 May 2008 10:16:33 -0700
changeset 594
af059c49e677
parent 593
a49545cab84a
child 596
27f13876aef3

6703308: Fix jprt.properties to allow for jdk6 and jdk7 builds
Summary: Allows for jprt submit -release option to select jdk version and proper build targets.
Reviewed-by: jcoomes

make/jprt.properties file | annotate | diff | comparison | revisions
     1.1 --- a/make/jprt.properties	Tue May 27 09:47:18 2008 -0700
     1.2 +++ b/make/jprt.properties	Wed May 28 10:16:33 2008 -0700
     1.3 @@ -24,209 +24,274 @@
     1.4  
     1.5  # Properties for jprt
     1.6  
     1.7 -JPRT.tools.default.release=jdk1.7.0
     1.8 +# All build result bundles are full jdks, so the 64bit testing does not 
     1.9 +#    need the 32bit sibling bundle installed.
    1.10 +#    Note: If the hotspot/make/Makefile changed to only bundle the 64bit files
    1.11 +#          when bundling 64bit, and stripped out the 64bit files from any 32bit
    1.12 +#          bundles, then this setting would be need to be "true".
    1.13  
    1.14 -# Build result bundles are not partial builds| but include everything
    1.15 -JPRT.need.sibling.build=false
    1.16 +jprt.need.sibling.build=false
    1.17  
    1.18 -# Directories needed to build
    1.19 -JPRT.bundle.src.dirs=make src agent
    1.20 -JPRT.bundle.exclude.src.dirs=build
    1.21 +# At submit time, the release supplied will be in jprt.submit.release
    1.22 +#    and will be one of the official release names defined in jprt.
    1.23 +#    jprt supports property value expansion using ${property.name} syntax.
    1.24  
    1.25 +# This tells jprt what default release we want to build
    1.26  
    1.27 -# Standard list of JPRT build targets for this workspace
    1.28 -JPRT.build.targets= \
    1.29 -    solaris_sparc_5.10-{product|fastdebug|debug}, \
    1.30 -    solaris_sparcv9_5.10-{product|fastdebug|debug}, \
    1.31 -    solaris_i586_5.10-{product|fastdebug|debug}, \
    1.32 -    solaris_x64_5.10-{product|fastdebug|debug}, \
    1.33 -    linux_i586-{product|fastdebug|debug}, \
    1.34 -    linux_x64-{product|fastdebug}, \
    1.35 -    windows_i586-{product|fastdebug|debug}, \
    1.36 -    windows_x64-{product|fastdebug|debug}
    1.37 +jprt.tools.default.release=${jprt.submit.release}
    1.38  
    1.39 -# Standard list of JPRT test targets for this workspace
    1.40 -JPRT.test.targets = \
    1.41 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-jvm98, \
    1.42 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-scimark, \
    1.43 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-jvm98, \
    1.44 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-scimark, \
    1.45 -    solaris_i586_5.10-{product|fastdebug}-{c1|c2}-jvm98, \
    1.46 -    solaris_i586_5.10-{product|fastdebug}-{c1|c2}-scimark, \
    1.47 -    solaris_x64_5.10-{product|fastdebug}-c2-jvm98, \
    1.48 -    solaris_x64_5.10-{product|fastdebug}-c2-scimark, \
    1.49 -    linux_i586-{product|fastdebug}-{c1|c2}-jvm98, \
    1.50 -    linux_i586-{product|fastdebug}-{c1|c2}-scimark, \
    1.51 -    linux_x64-{product|fastdebug}-c2-jvm98, \
    1.52 -    linux_x64-{product|fastdebug}-c2-scimark, \
    1.53 -    windows_i586-{product|fastdebug}-{c1|c2}-jvm98, \
    1.54 -    windows_i586-{product|fastdebug}-{c1|c2}-scimark, \
    1.55 -    windows_x64-{product|fastdebug}-c2-jvm98, \
    1.56 -    windows_x64-{product|fastdebug}-c2-scimark, \
    1.57 -    solaris_sparc_5.10-product-{c1|c2}-runThese, \
    1.58 -    solaris_sparc_5.10-product-{c1|c2}-runThese_Xcomp, \
    1.59 -    solaris_sparc_5.10-product-{c1|c2}-runThese_Xcomp_2, \
    1.60 -    solaris_sparc_5.10-product-{c1|c2}-runThese_Xcomp_3, \
    1.61 -    solaris_sparc_5.10-fastdebug-c1-runThese_Xshare, \
    1.62 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_default, \
    1.63 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
    1.64 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
    1.65 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
    1.66 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
    1.67 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_default_2, \
    1.68 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC_2, \
    1.69 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC_2, \
    1.70 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC_2, \
    1.71 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCBasher_CMS_2, \
    1.72 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCOld_default, \
    1.73 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCOld_SerialGC, \
    1.74 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCOld_ParallelGC, \
    1.75 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCOld_ParNewGC, \
    1.76 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-GCOld_CMS, \
    1.77 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-jbb_default, \
    1.78 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \
    1.79 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \
    1.80 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-jbb_CMS, \
    1.81 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-scimark_2, \
    1.82 -    solaris_sparc_5.10-{product|fastdebug}-{c1|c2}-scimark_3, \
    1.83 -    solaris_sparcv9_5.10-product-c2-runThese, \
    1.84 -    solaris_sparcv9_5.10-product-c2-runThese_Xcomp, \
    1.85 -    solaris_sparcv9_5.10-product-c2-runThese_Xcomp_2, \
    1.86 -    solaris_sparcv9_5.10-product-c2-runThese_Xcomp_3, \
    1.87 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_default, \
    1.88 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_SerialGC, \
    1.89 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParallelGC, \
    1.90 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParNewGC, \
    1.91 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_CMS, \
    1.92 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_default_2, \
    1.93 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_SerialGC_2, \
    1.94 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParallelGC_2, \
    1.95 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParNewGC_2, \
    1.96 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_CMS_2, \
    1.97 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_default, \
    1.98 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_SerialGC, \
    1.99 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.100 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.101 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_CMS, \
   1.102 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_default, \
   1.103 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_SerialGC, \
   1.104 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_ParallelGC, \
   1.105 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_CMS, \
   1.106 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-scimark_2, \
   1.107 -    solaris_sparcv9_5.10-{product|fastdebug}-c2-scimark_3, \
   1.108 -    solaris_x64-product-c2-runThese, \
   1.109 -    solaris_x64-product-c2-runThese_Xcomp, \
   1.110 -    solaris_x64-{product|fastdebug}-c2-GCBasher_default, \
   1.111 -    solaris_x64-{product|fastdebug}-c2-GCBasher_SerialGC, \
   1.112 -    solaris_x64-{product|fastdebug}-c2-GCBasher_ParallelGC, \
   1.113 -    solaris_x64-{product|fastdebug}-c2-GCBasher_ParNewGC, \
   1.114 -    solaris_x64-{product|fastdebug}-c2-GCBasher_CMS, \
   1.115 -    solaris_x64-{product|fastdebug}-c2-GCBasher_default_2, \
   1.116 -    solaris_x64-{product|fastdebug}-c2-GCBasher_SerialGC_2, \
   1.117 -    solaris_x64-{product|fastdebug}-c2-GCBasher_ParallelGC_2, \
   1.118 -    solaris_x64-{product|fastdebug}-c2-GCBasher_ParNewGC_2, \
   1.119 -    solaris_x64-{product|fastdebug}-c2-GCBasher_CMS_2, \
   1.120 -    solaris_x64-{product|fastdebug}-c2-GCOld_default, \
   1.121 -    solaris_x64-{product|fastdebug}-c2-GCOld_SerialGC, \
   1.122 -    solaris_x64-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.123 -    solaris_x64-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.124 -    solaris_x64-{product|fastdebug}-c2-GCOld_CMS, \
   1.125 -    solaris_x64-{product|fastdebug}-c2-jbb_default, \
   1.126 -    solaris_x64-{product|fastdebug}-c2-jbb_SerialGC, \
   1.127 -    solaris_x64-{product|fastdebug}-c2-jbb_ParallelGC, \
   1.128 -    solaris_x64-{product|fastdebug}-c2-jbb_CMS, \
   1.129 -    solaris_i586_5.10-product-{c1|c2}-runThese_Xcomp, \
   1.130 -    solaris_i586_5.10-product-c2-runThese_Xcomp_2, \
   1.131 -    solaris_i586_5.10-fastdebug-c1-runThese_Xcomp_2, \
   1.132 -    solaris_i586_5.10-fastdebug-c1-runThese_Xshare, \
   1.133 -    solaris_i586_5.10-product-c1-GCBasher_default, \
   1.134 -    solaris_i586_5.10-product-c1-GCBasher_SerialGC, \
   1.135 -    solaris_i586_5.10-product-c1-GCBasher_ParallelGC, \
   1.136 -    solaris_i586_5.10-product-c1-GCBasher_ParNewGC, \
   1.137 -    solaris_i586_5.10-product-c1-GCBasher_CMS, \
   1.138 -    solaris_i586_5.10-fastdebug-c2-GCBasher_default, \
   1.139 -    solaris_i586_5.10-fastdebug-c2-GCBasher_SerialGC, \
   1.140 -    solaris_i586_5.10-fastdebug-c2-GCBasher_ParallelGC, \
   1.141 -    solaris_i586_5.10-fastdebug-c2-GCBasher_ParNewGC, \
   1.142 -    solaris_i586_5.10-fastdebug-c2-GCBasher_CMS, \
   1.143 -    solaris_i586_5.10-product-c1-GCOld_default, \
   1.144 -    solaris_i586_5.10-product-c1-GCOld_SerialGC, \
   1.145 -    solaris_i586_5.10-product-c1-GCOld_ParallelGC, \
   1.146 -    solaris_i586_5.10-product-c1-GCOld_ParNewGC, \
   1.147 -    solaris_i586_5.10-product-c1-GCOld_CMS, \
   1.148 -    solaris_i586_5.10-fastdebug-c2-jbb_default, \
   1.149 -    solaris_i586_5.10-fastdebug-c2-jbb_ParallelGC, \
   1.150 -    solaris_i586_5.10-fastdebug-c2-jbb_CMS, \
   1.151 -    solaris_i586_5.10-{product|fastdebug}-{c1|c2}-scimark_2, \
   1.152 -    solaris_i586_5.10-{product|fastdebug}-{c1|c2}-scimark_3, \
   1.153 -    linux_i586-product-c1-runThese_Xcomp, \
   1.154 -    linux_i586-product-c1-runThese_Xcomp_2, \
   1.155 -    linux_i586-product-c1-runThese_Xcomp_3, \
   1.156 -    linux_i586-fastdebug-c1-runThese_Xshare, \
   1.157 -    linux_i586-fastdebug-c2-runThese_Xcomp, \
   1.158 -    linux_i586-fastdebug-c2-runThese_Xcomp_2, \
   1.159 -    linux_i586-{product|fastdebug}-{c1|c2}-GCBasher_default, \
   1.160 -    linux_i586-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
   1.161 -    linux_i586-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
   1.162 -    linux_i586-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
   1.163 -    linux_i586-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
   1.164 -    linux_i586-product-{c1|c2}-GCOld_default, \
   1.165 -    linux_i586-product-{c1|c2}-GCOld_SerialGC, \
   1.166 -    linux_i586-product-{c1|c2}-GCOld_ParallelGC, \
   1.167 -    linux_i586-product-{c1|c2}-GCOld_ParNewGC, \
   1.168 -    linux_i586-product-{c1|c2}-GCOld_CMS, \
   1.169 -    linux_i586-{product|fastdebug}-c1-jbb_default, \
   1.170 -    linux_i586-{product|fastdebug}-c1-jbb_ParallelGC, \
   1.171 -    linux_i586-{product|fastdebug}-c1-jbb_CMS, \
   1.172 -    linux_i586-{product|fastdebug}-c2-scimark_2, \
   1.173 -    linux_i586-{product|fastdebug}-c2-scimark_3, \
   1.174 -    linux_x64-{product|fastdebug}-c2-GCBasher_default, \
   1.175 -    linux_x64-{product|fastdebug}-c2-GCBasher_SerialGC, \
   1.176 -    linux_x64-{product|fastdebug}-c2-GCBasher_ParallelGC, \
   1.177 -    linux_x64-{product|fastdebug}-c2-GCBasher_ParNewGC, \
   1.178 -    linux_x64-{product|fastdebug}-c2-GCBasher_CMS, \
   1.179 -    linux_x64-{product|fastdebug}-c2-GCOld_default, \
   1.180 -    linux_x64-{product|fastdebug}-c2-GCOld_SerialGC, \
   1.181 -    linux_x64-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.182 -    linux_x64-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.183 -    linux_x64-{product|fastdebug}-c2-GCOld_CMS, \
   1.184 -    linux_x64-{product|fastdebug}-c2-jbb_default, \
   1.185 -    linux_x64-{product|fastdebug}-c2-jbb_ParallelGC, \
   1.186 -    linux_x64-{product|fastdebug}-c2-scimark_2, \
   1.187 -    linux_x64-{product|fastdebug}-c2-scimark_3, \
   1.188 -    windows_i586-product-{c1|c2}-runThese, \
   1.189 -    windows_i586-product-{c1|c2}-runThese_Xcomp, \
   1.190 -    windows_i586-fastdebug-c1-runThese_Xshare, \
   1.191 -    windows_i586-{product|fastdebug}-{c1|c2}-GCBasher_default, \
   1.192 -    windows_i586-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
   1.193 -    windows_i586-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
   1.194 -    windows_i586-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
   1.195 -    windows_i586-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
   1.196 -    windows_i586-product-{c1|c2}-GCOld_default, \
   1.197 -    windows_i586-product-{c1|c2}-GCOld_SerialGC, \
   1.198 -    windows_i586-product-{c1|c2}-GCOld_ParallelGC, \
   1.199 -    windows_i586-product-{c1|c2}-GCOld_ParNewGC, \
   1.200 -    windows_i586-product-{c1|c2}-GCOld_CMS, \
   1.201 -    windows_i586-{product|fastdebug}-{c1|c2}-jbb_default, \
   1.202 -    windows_i586-product-{c1|c2}-jbb_ParallelGC, \
   1.203 -    windows_i586-product-{c1|c2}-jbb_CMS, \
   1.204 -    windows_i586-product-{c1|c2}-scimark_2, \
   1.205 -    windows_i586-product-{c1|c2}-scimark_3, \
   1.206 -    windows_x64-product-c2-runThese, \
   1.207 -    windows_x64-product-c2-runThese_Xcomp, \
   1.208 -    windows_x64-{product|fastdebug}-c2-GCBasher_default, \
   1.209 -    windows_x64-{product|fastdebug}-c2-GCBasher_SerialGC, \
   1.210 -    windows_x64-{product|fastdebug}-c2-GCBasher_ParallelGC, \
   1.211 -    windows_x64-{product|fastdebug}-c2-GCBasher_ParNewGC, \
   1.212 -    windows_x64-{product|fastdebug}-c2-GCBasher_CMS, \
   1.213 -    windows_x64-{product|fastdebug}-c2-GCOld_default, \
   1.214 -    windows_x64-{product|fastdebug}-c2-GCOld_SerialGC, \
   1.215 -    windows_x64-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.216 -    windows_x64-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.217 -    windows_x64-{product|fastdebug}-c2-GCOld_CMS, \
   1.218 -    windows_x64-{product|fastdebug}-c2-jbb_default, \
   1.219 -    windows_x64-product-c2-jbb_CMS, \
   1.220 -    windows_x64-product-c2-jbb_ParallelGC, \
   1.221 -    windows_x64-{product|fastdebug}-c2-scimark_2, \
   1.222 -    windows_x64-{product|fastdebug}-c2-scimark_3
   1.223 +# Define the Solaris platforms we want for the various releases
   1.224  
   1.225 +jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
   1.226 +jprt.my.solaris.sparc.jdk6=solaris_sparc_5.8
   1.227 +jprt.my.solaris.sparc.jdk6perf=solaris_sparc_5.8
   1.228 +jprt.my.solaris.sparc.jdk6u10=solaris_sparc_5.8
   1.229 +jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
   1.230 +
   1.231 +jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
   1.232 +jprt.my.solaris.sparcv9.jdk6=solaris_sparcv9_5.8
   1.233 +jprt.my.solaris.sparcv9.jdk6perf=solaris_sparcv9_5.8
   1.234 +jprt.my.solaris.sparcv9.jdk6u10=solaris_sparcv9_5.8
   1.235 +jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
   1.236 +
   1.237 +jprt.my.solaris.i586.jdk7=solaris_i586_5.10
   1.238 +jprt.my.solaris.i586.jdk6=solaris_i586_5.8
   1.239 +jprt.my.solaris.i586.jdk6perf=solaris_i586_5.8
   1.240 +jprt.my.solaris.i586.jdk6u10=solaris_i586_5.8
   1.241 +jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
   1.242 +
   1.243 +jprt.my.solaris.x64.jdk7=solaris_x64_5.10
   1.244 +jprt.my.solaris.x64.jdk6=solaris_x64_5.10
   1.245 +jprt.my.solaris.x64.jdk6perf=solaris_x64_5.10
   1.246 +jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10
   1.247 +jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
   1.248 +
   1.249 +jprt.my.linux.i586=linux_i586
   1.250 +jprt.my.linux.x64=linux_x64
   1.251 +jprt.my.windows.i586=windows_i586
   1.252 +jprt.my.windows.x64=windows_x64
   1.253 +
   1.254 +# Standard list of jprt build targets for this source tree
   1.255 +
   1.256 +jprt.build.targets= \
   1.257 +    ${jprt.my.solaris.sparc}-{product|fastdebug|debug}, \
   1.258 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \
   1.259 +    ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \
   1.260 +    ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \
   1.261 +    ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
   1.262 +    ${jprt.my.linux.x64}-{product|fastdebug}, \
   1.263 +    ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
   1.264 +    ${jprt.my.windows.x64}-{product|fastdebug|debug}
   1.265 +
   1.266 +# Subset lists of test targets for this source tree
   1.267 +
   1.268 +jprt.my.solaris.sparc.test.targets= \
   1.269 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jvm98, \
   1.270 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \
   1.271 +    ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \
   1.272 +    ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese_Xcomp, \
   1.273 +    ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese_Xcomp_2, \
   1.274 +    ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese_Xcomp_3, \
   1.275 +    ${jprt.my.solaris.sparc}-fastdebug-c1-runThese_Xshare, \
   1.276 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
   1.277 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
   1.278 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
   1.279 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
   1.280 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
   1.281 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_default_2, \
   1.282 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC_2, \
   1.283 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC_2, \
   1.284 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC_2, \
   1.285 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_CMS_2, \
   1.286 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_default, \
   1.287 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_SerialGC, \
   1.288 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParallelGC, \
   1.289 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParNewGC, \
   1.290 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_CMS, \
   1.291 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_default, \
   1.292 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \
   1.293 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \
   1.294 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_CMS, \
   1.295 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark_2, \
   1.296 +    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark_3
   1.297 +
   1.298 +jprt.my.solaris.sparcv9.test.targets= \
   1.299 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98, \
   1.300 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-scimark, \
   1.301 +    ${jprt.my.solaris.sparcv9}-product-c2-runThese, \
   1.302 +    ${jprt.my.solaris.sparcv9}-product-c2-runThese_Xcomp, \
   1.303 +    ${jprt.my.solaris.sparcv9}-product-c2-runThese_Xcomp_2, \
   1.304 +    ${jprt.my.solaris.sparcv9}-product-c2-runThese_Xcomp_3, \
   1.305 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_default, \
   1.306 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_SerialGC, \
   1.307 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
   1.308 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
   1.309 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_CMS, \
   1.310 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_default_2, \
   1.311 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_SerialGC_2, \
   1.312 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParallelGC_2, \
   1.313 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParNewGC_2, \
   1.314 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_CMS_2, \
   1.315 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_default, \
   1.316 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_SerialGC, \
   1.317 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.318 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.319 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_CMS, \
   1.320 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default, \
   1.321 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_SerialGC, \
   1.322 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_ParallelGC, \
   1.323 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_CMS, \
   1.324 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-scimark_2, \
   1.325 +    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-scimark_3
   1.326 +
   1.327 +jprt.my.solaris.x64.test.targets= \
   1.328 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jvm98, \
   1.329 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-scimark, \
   1.330 +    ${jprt.my.solaris.x64}-product-c2-runThese, \
   1.331 +    ${jprt.my.solaris.x64}-product-c2-runThese_Xcomp, \
   1.332 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_default, \
   1.333 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
   1.334 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
   1.335 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
   1.336 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
   1.337 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_default_2, \
   1.338 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_SerialGC_2, \
   1.339 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC_2, \
   1.340 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC_2, \
   1.341 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_CMS_2, \
   1.342 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_default, \
   1.343 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
   1.344 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.345 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.346 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_CMS, \
   1.347 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default, \
   1.348 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_SerialGC, \
   1.349 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
   1.350 +    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_CMS
   1.351 +
   1.352 +jprt.my.solaris.i586.test.targets= \
   1.353 +    ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
   1.354 +    ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark, \
   1.355 +    ${jprt.my.solaris.i586}-product-{c1|c2}-runThese_Xcomp, \
   1.356 +    ${jprt.my.solaris.i586}-product-c2-runThese_Xcomp_2, \
   1.357 +    ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xcomp_2, \
   1.358 +    ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xshare, \
   1.359 +    ${jprt.my.solaris.i586}-product-c1-GCBasher_default, \
   1.360 +    ${jprt.my.solaris.i586}-product-c1-GCBasher_SerialGC, \
   1.361 +    ${jprt.my.solaris.i586}-product-c1-GCBasher_ParallelGC, \
   1.362 +    ${jprt.my.solaris.i586}-product-c1-GCBasher_ParNewGC, \
   1.363 +    ${jprt.my.solaris.i586}-product-c1-GCBasher_CMS, \
   1.364 +    ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_default, \
   1.365 +    ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_SerialGC, \
   1.366 +    ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParallelGC, \
   1.367 +    ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParNewGC, \
   1.368 +    ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_CMS, \
   1.369 +    ${jprt.my.solaris.i586}-product-c1-GCOld_default, \
   1.370 +    ${jprt.my.solaris.i586}-product-c1-GCOld_SerialGC, \
   1.371 +    ${jprt.my.solaris.i586}-product-c1-GCOld_ParallelGC, \
   1.372 +    ${jprt.my.solaris.i586}-product-c1-GCOld_ParNewGC, \
   1.373 +    ${jprt.my.solaris.i586}-product-c1-GCOld_CMS, \
   1.374 +    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default, \
   1.375 +    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParallelGC, \
   1.376 +    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_CMS, \
   1.377 +    ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \
   1.378 +    ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3
   1.379 +
   1.380 +jprt.my.linux.i586.test.targets = \
   1.381 +    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
   1.382 +    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \
   1.383 +    ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \
   1.384 +    ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \
   1.385 +    ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \
   1.386 +    ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \
   1.387 +    ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \
   1.388 +    ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \
   1.389 +    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
   1.390 +    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
   1.391 +    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
   1.392 +    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
   1.393 +    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
   1.394 +    ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \
   1.395 +    ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \
   1.396 +    ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \
   1.397 +    ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \
   1.398 +    ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \
   1.399 +    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \
   1.400 +    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \
   1.401 +    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \
   1.402 +    ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \
   1.403 +    ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3
   1.404 +
   1.405 +jprt.my.linux.x64.test.targets = \
   1.406 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \
   1.407 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-scimark, \
   1.408 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_default, \
   1.409 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
   1.410 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
   1.411 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
   1.412 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
   1.413 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_default, \
   1.414 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
   1.415 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.416 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.417 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_CMS, \
   1.418 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default, \
   1.419 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
   1.420 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-scimark_2, \
   1.421 +    ${jprt.my.linux.x64}-{product|fastdebug}-c2-scimark_3
   1.422 +
   1.423 +jprt.my.windows.i586.test.targets = \
   1.424 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
   1.425 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-scimark, \
   1.426 +    ${jprt.my.windows.i586}-product-{c1|c2}-runThese, \
   1.427 +    ${jprt.my.windows.i586}-product-{c1|c2}-runThese_Xcomp, \
   1.428 +    ${jprt.my.windows.i586}-fastdebug-c1-runThese_Xshare, \
   1.429 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
   1.430 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
   1.431 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
   1.432 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
   1.433 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
   1.434 +    ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_default, \
   1.435 +    ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_SerialGC, \
   1.436 +    ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParallelGC, \
   1.437 +    ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParNewGC, \
   1.438 +    ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_CMS, \
   1.439 +    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jbb_default, \
   1.440 +    ${jprt.my.windows.i586}-product-{c1|c2}-jbb_ParallelGC, \
   1.441 +    ${jprt.my.windows.i586}-product-{c1|c2}-jbb_CMS, \
   1.442 +    ${jprt.my.windows.i586}-product-{c1|c2}-scimark_2, \
   1.443 +    ${jprt.my.windows.i586}-product-{c1|c2}-scimark_3
   1.444 +
   1.445 +jprt.my.windows.x64.test.targets = \
   1.446 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-jvm98, \
   1.447 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-scimark, \
   1.448 +    ${jprt.my.windows.x64}-product-c2-runThese, \
   1.449 +    ${jprt.my.windows.x64}-product-c2-runThese_Xcomp, \
   1.450 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_default, \
   1.451 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
   1.452 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
   1.453 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
   1.454 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
   1.455 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_default, \
   1.456 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
   1.457 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
   1.458 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
   1.459 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_CMS, \
   1.460 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-jbb_default, \
   1.461 +    ${jprt.my.windows.x64}-product-c2-jbb_CMS, \
   1.462 +    ${jprt.my.windows.x64}-product-c2-jbb_ParallelGC, \
   1.463 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-scimark_2, \
   1.464 +    ${jprt.my.windows.x64}-{product|fastdebug}-c2-scimark_3
   1.465 +
   1.466 +# The complete list of test targets for jprt
   1.467 +
   1.468 +jprt.test.targets = \
   1.469 +  ${jprt.my.solaris.sparc.test.targets}, \
   1.470 +  ${jprt.my.solaris.sparcv9.test.targets}, \
   1.471 +  ${jprt.my.solaris.i586.test.targets}, \
   1.472 +  ${jprt.my.solaris.x64.test.targets}, \
   1.473 +  ${jprt.my.linux.i586.test.targets}, \
   1.474 +  ${jprt.my.linux.x64.test.targets}, \
   1.475 +  ${jprt.my.windows.i586.test.targets}, \
   1.476 +  ${jprt.my.windows.x64.test.targets}
   1.477 +

mercurial