make/jprt.properties

changeset 1152
2c08ede0f740
parent 1140
6d0ebf545f49
child 1159
1f2473d3c38e
     1.1 --- a/make/jprt.properties	Thu Jul 17 22:45:46 2014 +0100
     1.2 +++ b/make/jprt.properties	Thu Jul 17 23:07:16 2014 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -23,151 +23,461 @@
    1.11  # questions.
    1.12  #
    1.13  
    1.14 -# Properties for jprt
    1.15 +##############
    1.16 +#
    1.17 +# Global settings
    1.18 +#
    1.19  
    1.20 -# Locked down to jdk8
    1.21 -jprt.tools.default.release=jdk8
    1.22 +# The current release name
    1.23 +my.jdk.update.version=20
    1.24 +jprt.tools.default.release=jdk8u${my.jdk.update.version}
    1.25  
    1.26 -# Unix toolkit to use for building on windows
    1.27 -jprt.windows.jdk8.build.unix.toolkit=cygwin
    1.28 +# Check if this is the equivalent of a hotspot push job
    1.29 +# Interpret -testset hotspot to mean exactly that
    1.30 +my.is.hotspot.job.hotspot=true
    1.31 +my.is.hotspot.job=${my.is.hotspot.job.${jprt.test.set}}
    1.32  
    1.33 -# The different build flavors we want, we override here so we just get these 2
    1.34 -jprt.build.flavors=product,fastdebug
    1.35 -
    1.36 -# Standard list of jprt build targets for this source tree
    1.37 -jprt.build.targets= 						\
    1.38 -    solaris_sparcv9_5.10-{product|fastdebug}, 			\
    1.39 -    solaris_x64_5.10-{product|fastdebug}, 			\
    1.40 -    linux_i586_2.6-{product|fastdebug}, 			\
    1.41 -    linux_x64_2.6-{product|fastdebug}, 				\
    1.42 -    macosx_x64_10.7-{product|fastdebug}, 			\
    1.43 -    windows_i586_6.1-{product|fastdebug}, 			\
    1.44 -    windows_x64_6.1-{product|fastdebug}
    1.45 -
    1.46 -# User can select the test set with jprt submit "-testset name" option
    1.47 -jprt.my.test.set=${jprt.test.set}
    1.48 -
    1.49 -# Test target list (no fastdebug & limited c2 testing)
    1.50 -jprt.my.test.target.set= \
    1.51 -    solaris_sparcv9_5.10-product-c2-TESTNAME, 			\
    1.52 -    solaris_x64_5.10-product-c2-TESTNAME, 			\
    1.53 -    linux_i586_2.6-product-{c1|c2}-TESTNAME, 			\
    1.54 -    linux_x64_2.6-product-c2-TESTNAME, 				\
    1.55 -    macosx_x64_10.7-product-c2-TESTNAME, 			\
    1.56 -    windows_i586_6.1-product-c1-TESTNAME, 			\
    1.57 -    windows_x64_6.1-product-c2-TESTNAME
    1.58 -
    1.59 -# Default vm test targets (testset=default)
    1.60 -jprt.vm.default.test.targets=              			\
    1.61 -    ${jprt.my.test.target.set:TESTNAME=jvm98},			\
    1.62 -    ${jprt.my.test.target.set:TESTNAME=scimark}
    1.63 -
    1.64 -# Default jdk test targets (testset=default)
    1.65 -jprt.make.rule.default.test.targets=				\
    1.66 -    ${jprt.my.test.target.set:TESTNAME=langtools_jtreg},        \
    1.67 -    ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
    1.68 -    ${jprt.my.test.target.set:TESTNAME=jdk_math},               \
    1.69 -    ${jprt.my.test.target.set:TESTNAME=jdk_util}
    1.70 -    
    1.71 -
    1.72 -# Default vm test targets (testset=core)
    1.73 -jprt.vm.core.test.targets=
    1.74 -
    1.75 -# Core jdk test targets (testset=core)
    1.76 -jprt.make.rule.core.test.targets=                               \
    1.77 -    ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
    1.78 -    ${jprt.my.test.target.set:TESTNAME=jdk_math},               \
    1.79 -    ${jprt.my.test.target.set:TESTNAME=jdk_util},               \
    1.80 -    ${jprt.my.test.target.set:TESTNAME=jdk_io},			\
    1.81 -    ${jprt.my.test.target.set:TESTNAME=jdk_net},		\
    1.82 -    ${jprt.my.test.target.set:TESTNAME=jdk_nio},		\
    1.83 -    ${jprt.my.test.target.set:TESTNAME=jdk_security1},		\
    1.84 -    ${jprt.my.test.target.set:TESTNAME=jdk_security2},          \
    1.85 -    ${jprt.my.test.target.set:TESTNAME=jdk_security3},          \
    1.86 -    ${jprt.my.test.target.set:TESTNAME=jdk_rmi},                \
    1.87 -    ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
    1.88 -    ${jprt.my.test.target.set:TESTNAME=jdk_time},               \
    1.89 -    ${jprt.my.test.target.set:TESTNAME=jdk_other},              \
    1.90 -    ${jprt.my.test.target.set:TESTNAME=core_tools}
    1.91 -
    1.92 -# Svc vm test targets (testset=svc)
    1.93 -jprt.vm.svc.test.targets=
    1.94 -
    1.95 -# Core jdk test targets (testset=svc)
    1.96 -jprt.make.rule.svc.test.targets=                                \
    1.97 -    ${jprt.my.test.target.set:TESTNAME=jdk_management},         \
    1.98 -    ${jprt.my.test.target.set:TESTNAME=jdk_instrument},         \
    1.99 -    ${jprt.my.test.target.set:TESTNAME=jdk_jmx},                \
   1.100 -    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
   1.101 -    ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
   1.102 -    ${jprt.my.test.target.set:TESTNAME=svc_tools}
   1.103 -
   1.104 -# All vm test targets (testset=all)
   1.105 -jprt.vm.all.test.targets=    					\
   1.106 -    ${jprt.vm.default.test.targets}, 				\
   1.107 -    ${jprt.my.test.target.set:TESTNAME=runThese},		\
   1.108 -    ${jprt.my.test.target.set:TESTNAME=jbb_default}
   1.109 -
   1.110 -# All jdk test targets (testset=all)
   1.111 -jprt.make.rule.all.test.targets=    				\
   1.112 -    ${jprt.make.rule.core.test.targets}, 			\
   1.113 -    ${jprt.make.rule.svc.test.targets},                         \
   1.114 -    ${jprt.my.test.target.set:TESTNAME=jdk_awt},		\
   1.115 -    ${jprt.my.test.target.set:TESTNAME=jdk_beans1},             \
   1.116 -    ${jprt.my.test.target.set:TESTNAME=jdk_beans2},		\
   1.117 -    ${jprt.my.test.target.set:TESTNAME=jdk_beans3},		\
   1.118 -    ${jprt.my.test.target.set:TESTNAME=jdk_sound},		\
   1.119 -    ${jprt.my.test.target.set:TESTNAME=jdk_swing}
   1.120 -
   1.121 -# PIT vm test targets (testset=pit)
   1.122 -jprt.vm.pit.test.targets=                                       \
   1.123 -   ${jprt.vm.all.test.targets}
   1.124 -
   1.125 -# PIT jdk test targets (testset=pit)
   1.126 -jprt.make.rule.pit.test.targets=                                \
   1.127 -    ${jprt.my.test.target.set:TESTNAME=langtools_jtreg},        \
   1.128 -    ${jprt.make.rule.core.test.targets},                        \
   1.129 -    ${jprt.make.rule.svc.test.targets}
   1.130 -
   1.131 -# JCK test targets in test/Makefile (no windows)
   1.132 -jprt.my.jck.test.target.set=					\
   1.133 -    solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, 		\
   1.134 -    solaris_x64_5.10-product-c2-JCK7TESTRULE, 			\
   1.135 -    linux_i586_2.6-product-c1-JCK7TESTRULE, 			\
   1.136 -    linux_x64_2.6-product-c2-JCK7TESTRULE
   1.137 -
   1.138 -# JCK testset targets (e.g. jprt submit -testset jck ... )
   1.139 -jprt.make.rule.jck.test.targets=				\
   1.140 -    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools},   \
   1.141 -    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime},    \
   1.142 -    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
   1.143 -
   1.144 -# Select list to use (allow for testset to be empty too)
   1.145 -jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
   1.146 -jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
   1.147 -jprt.vm..test.targets=${jprt.vm.default.test.targets}
   1.148 -jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
   1.149 +# Disable syncing the source after builds and tests are done
   1.150 +jprt.sync.push=${my.is.hotspot.job ? false : true}
   1.151  
   1.152  # Directories to be excluded from the source bundles
   1.153  jprt.bundle.exclude.src.dirs=build dist webrev
   1.154  
   1.155 -# Instruct jprt to use configure when building
   1.156 +# Use configure when building
   1.157  jprt.build.use.configure=true
   1.158 +
   1.159 +# Set make target to use for different build flavors
   1.160 +jprt.build.flavor.debugOpen.target=jprt_bundle
   1.161 +jprt.build.flavor.fastdebug.target=jprt_bundle
   1.162  jprt.build.flavor.product.target=jprt_bundle
   1.163 -jprt.build.flavor.fastdebug.target=jprt_bundle
   1.164 -jprt.build.flavor.debug.target=jprt_bundle
   1.165 +jprt.build.flavor.productOpen.target=jprt_bundle
   1.166  
   1.167 -# Add these configure args to all builds
   1.168 -jprt.build.configure.args= \
   1.169 -    --with-boot-jdk=$ALT_BOOTDIR \
   1.170 -    --with-jobs=$ALT_PARALLEL_COMPILE_JOBS
   1.171 +# Use these configure args to define debug level
   1.172 +jprt.debug.build.configure.args=--with-debug-level=slowdebug
   1.173 +jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
   1.174 +jprt.product.build.configure.args=--with-debug-level=release
   1.175 +jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
   1.176 +jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args} --enable-openjdk-only
   1.177 +jprt.productOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
   1.178  
   1.179 -# Add these configure args to 32 bit builds
   1.180 -jprt.i586.build.configure.args= \
   1.181 -    --with-target-bits=32 \
   1.182 +# Select build flavors and build targets
   1.183 +jprt.build.flavors=${my.is.hotspot.job ? ${my.build.flavors.hotspot} : ${my.build.flavors.default}}
   1.184 +jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}}
   1.185 +
   1.186 +# Select test targets - jprt default for jprt.test.set is "default"
   1.187 +jprt.test.targets=${my.test.targets.${jprt.test.set}}
   1.188 +jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
   1.189 +
   1.190 +# 7155453: Work-around to prevent popups on OSX from blocking test completion
   1.191 +# but the work-around is added to all platforms to be consistent
   1.192 +jprt.jbb.options=-Djava.awt.headless=true
   1.193 +
   1.194 +########
   1.195 +#
   1.196 +# Build options (generic)
   1.197 +#
   1.198 +
   1.199 +# Configure args common to all builds
   1.200 +# Also allows for additional, testset specific configure arguments to be set
   1.201 +jprt.build.configure.args=						\
   1.202 +    --with-boot-jdk=$ALT_BOOTDIR					\
   1.203 +    --with-jobs=$ALT_PARALLEL_COMPILE_JOBS				\
   1.204 +    --with-update-version=${my.jdk.update.version}			\
   1.205 +    ${my.additional.build.configure.args.${jprt.test.set}}
   1.206 +
   1.207 +# i586 is often cross-compiled from 64-bit machines, so need to set target bits explicitly
   1.208 +jprt.i586.build.configure.args=						\
   1.209 +    --with-target-bits=32
   1.210 +
   1.211 +# i586 platforms have both client and server, but to allow for overriding the exact configuration
   1.212 +# on a per-build flavor basis the value is set for the individual build flavors
   1.213 +# All other platforms only build server, which is the default setting from configure
   1.214 +my.i586.default.build.configure.args=					\
   1.215      --with-jvm-variants=client,server
   1.216 +jprt.i586.debug.build.configure.args=					\
   1.217 +    ${my.i586.default.build.configure.args}				\
   1.218 +    ${jprt.debug.build.configure.args}
   1.219 +jprt.i586.fastdebug.build.configure.args=				\
   1.220 +    ${my.i586.default.build.configure.args}				\
   1.221 +    ${jprt.fastdebug.build.configure.args}
   1.222 +jprt.i586.product.build.configure.args=					\
   1.223 +    ${my.i586.default.build.configure.args}				\
   1.224 +    ${jprt.product.build.configure.args}
   1.225 +jprt.i586.debugOpen.build.configure.args=				\
   1.226 +    ${my.i586.default.build.configure.args}				\
   1.227 +    ${jprt.debugOpen.build.configure.args}
   1.228 +jprt.i586.fastdebugOpen.build.configure.args=				\
   1.229 +    ${my.i586.default.build.configure.args}				\
   1.230 +    ${jprt.fastdebugOpen.build.configure.args}
   1.231 +jprt.i586.productOpen.build.configure.args=				\
   1.232 +    ${my.i586.default.build.configure.args}				\
   1.233 +    ${jprt.productOpen.build.configure.args}
   1.234  
   1.235 -# Use these configure args to define debug level.
   1.236 -jprt.product.build.configure.args=--with-debug-level=release
   1.237 -jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
   1.238 -jprt.debug.build.configure.args=--with-debug-level=slowdebug
   1.239 +########
   1.240 +#
   1.241 +# Build targets and options (default/jdk)
   1.242 +#
   1.243 +
   1.244 +# The default build flavors
   1.245 +my.build.flavors.default=fastdebug,product
   1.246 +
   1.247 +# Standard list of jprt build targets for this source tree
   1.248 +my.build.targets.default=						\
   1.249 +    solaris_sparcv9_5.10-{product|fastdebug},				\
   1.250 +    solaris_x64_5.10-{product|fastdebug},				\
   1.251 +    linux_i586_2.6-{product|fastdebug},					\
   1.252 +    linux_x64_2.6-{product|fastdebug},					\
   1.253 +    macosx_x64_10.7-{product|fastdebug},				\
   1.254 +    windows_i586_6.1-{product|fastdebug},				\
   1.255 +    windows_x64_6.1-{product|fastdebug}
   1.256 +
   1.257 +# Test target list (no fastdebug & limited c2 testing)
   1.258 +my.test.target.set=							\
   1.259 +    solaris_sparcv9_5.10-product-c2-TESTNAME,				\
   1.260 +    solaris_x64_5.10-product-c2-TESTNAME,				\
   1.261 +    linux_i586_2.6-product-{c1|c2}-TESTNAME,				\
   1.262 +    linux_x64_2.6-product-c2-TESTNAME,					\
   1.263 +    macosx_x64_10.7-product-c2-TESTNAME,				\
   1.264 +    windows_i586_6.1-product-c1-TESTNAME,				\
   1.265 +    windows_x64_6.1-product-c2-TESTNAME
   1.266 +
   1.267 +# Default vm test targets (testset=default)
   1.268 +my.test.targets.default=						\
   1.269 +    ${my.test.target.set:TESTNAME=jvm98},				\
   1.270 +    ${my.test.target.set:TESTNAME=scimark}
   1.271 +
   1.272 +# Default jdk test targets (testset=default)
   1.273 +my.make.rule.test.targets.default=					\
   1.274 +    ${my.test.target.set:TESTNAME=langtools_jtreg},			\
   1.275 +    ${my.test.target.set:TESTNAME=jdk_lang},				\
   1.276 +    ${my.test.target.set:TESTNAME=jdk_math},				\
   1.277 +    ${my.test.target.set:TESTNAME=jdk_util}
   1.278 +    
   1.279 +# Default vm test targets (testset=core)
   1.280 +my.test.targets.core=
   1.281 +
   1.282 +# Core jdk test targets (testset=core)
   1.283 +my.make.rule.test.targets.core=						\
   1.284 +    ${my.test.target.set:TESTNAME=jdk_lang},				\
   1.285 +    ${my.test.target.set:TESTNAME=jdk_math},				\
   1.286 +    ${my.test.target.set:TESTNAME=jdk_util},				\
   1.287 +    ${my.test.target.set:TESTNAME=jdk_io},				\
   1.288 +    ${my.test.target.set:TESTNAME=jdk_net},				\
   1.289 +    ${my.test.target.set:TESTNAME=jdk_nio},				\
   1.290 +    ${my.test.target.set:TESTNAME=jdk_security1},			\
   1.291 +    ${my.test.target.set:TESTNAME=jdk_security2},			\
   1.292 +    ${my.test.target.set:TESTNAME=jdk_security3},			\
   1.293 +    ${my.test.target.set:TESTNAME=jdk_rmi},				\
   1.294 +    ${my.test.target.set:TESTNAME=jdk_text},				\
   1.295 +    ${my.test.target.set:TESTNAME=jdk_time},				\
   1.296 +    ${my.test.target.set:TESTNAME=jdk_other},				\
   1.297 +    ${my.test.target.set:TESTNAME=core_tools}
   1.298 +
   1.299 +# Svc vm test targets (testset=svc)
   1.300 +my.test.targets.svc=
   1.301 +
   1.302 +# Core jdk test targets (testset=svc)
   1.303 +my.make.rule.test.targets.svc=						\
   1.304 +    ${my.test.target.set:TESTNAME=jdk_management},			\
   1.305 +    ${my.test.target.set:TESTNAME=jdk_instrument},			\
   1.306 +    ${my.test.target.set:TESTNAME=jdk_jmx},				\
   1.307 +    ${my.test.target.set:TESTNAME=jdk_jdi},				\
   1.308 +    ${my.test.target.set:TESTNAME=jdk_jfr},				\
   1.309 +    ${my.test.target.set:TESTNAME=svc_tools}
   1.310 +
   1.311 +# All vm test targets (testset=all)
   1.312 +my.test.targets.all=							\
   1.313 +    ${my.test.targets.default},						\
   1.314 +    ${my.test.target.set:TESTNAME=runThese},				\
   1.315 +    ${my.test.target.set:TESTNAME=jbb_default}
   1.316 +
   1.317 +# All jdk test targets (testset=all)
   1.318 +my.make.rule.test.targets.all=						\
   1.319 +    ${my.make.rule.test.targets.core},					\
   1.320 +    ${my.make.rule.test.targets.svc},					\
   1.321 +    ${my.test.target.set:TESTNAME=jdk_awt},				\
   1.322 +    ${my.test.target.set:TESTNAME=jdk_beans1},				\
   1.323 +    ${my.test.target.set:TESTNAME=jdk_beans2},				\
   1.324 +    ${my.test.target.set:TESTNAME=jdk_beans3},				\
   1.325 +    ${my.test.target.set:TESTNAME=jdk_sound},				\
   1.326 +    ${my.test.target.set:TESTNAME=jdk_swing}
   1.327 +
   1.328 +# PIT vm test targets (testset=pit)
   1.329 +my.test.targets.pit=							\
   1.330 +   ${my.test.targets.all}
   1.331 +
   1.332 +# PIT jdk test targets (testset=pit)
   1.333 +my.make.rule.test.targets.pit=						\
   1.334 +    ${my.test.target.set:TESTNAME=langtools_jtreg},			\
   1.335 +    ${my.make.rule.test.targets.core},					\
   1.336 +    ${my.make.rule.test.targets.svc}
   1.337 +
   1.338 +# JCK test targets in test/Makefile (no windows)
   1.339 +my.test.target.set.jck=							\
   1.340 +    solaris_sparcv9_5.10-product-c2-JCK7TESTRULE,			\
   1.341 +    solaris_x64_5.10-product-c2-JCK7TESTRULE,				\
   1.342 +    linux_i586_2.6-product-c1-JCK7TESTRULE,				\
   1.343 +    linux_x64_2.6-product-c2-JCK7TESTRULE
   1.344 +
   1.345 +# JCK testset targets
   1.346 +my.make.rule.test.targets.jck=						\
   1.347 +    ${my.test.target.set.jck:JCK7TESTRULE=jck7devtools},		\
   1.348 +    ${my.test.target.set.jck:JCK7TESTRULE=jck7runtime},			\
   1.349 +    ${my.test.target.set.jck:JCK7TESTRULE=jck7compiler}
   1.350 +
   1.351 +
   1.352 +#############
   1.353 +#
   1.354 +# Hotspot related settings (testset=hotspot)
   1.355 +#
   1.356 +
   1.357 +# The hotspot build flavors
   1.358 +my.build.flavors.hotspot=						\
   1.359 +    debugOpen,fastdebug,product,productOpen,				\
   1.360 +    ${my.additional.build.flavors.hotspot}
   1.361 +
   1.362 +# Platforms built for hotspot push jobs
   1.363 +my.build.targets.hotspot=						\
   1.364 +    solaris_sparcv9_5.10-{product|fastdebug|optimized},			\
   1.365 +    solaris_x64_5.10-{product|fastdebug},				\
   1.366 +    linux_i586_2.6-{product|fastdebug},					\
   1.367 +    linux_x64_2.6-{product|fastdebug|optimized},			\
   1.368 +    macosx_x64_10.7-{product|fastdebug},				\
   1.369 +    windows_i586_6.1-{product|fastdebug},				\
   1.370 +    windows_x64_6.1-{product|fastdebug|optimized},			\
   1.371 +    solaris_x64_5.10-{debugOpen},					\
   1.372 +    linux_x64_2.6-{productOpen},					\
   1.373 +    ${my.additional.build.targets.hotspot}
   1.374 +
   1.375 +# Tests to run on the various platforms for hotspot push jobs
   1.376 +my.test.targets.hotspot.solaris.sparcv9=				\
   1.377 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jvm98,			\
   1.378 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jvm98_nontiered,	\
   1.379 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-scimark,		\
   1.380 +    solaris_sparcv9_5.10-product-c2-runThese,				\
   1.381 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_SerialGC,	\
   1.382 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParallelGC,	\
   1.383 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParNewGC,	\
   1.384 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_CMS,		\
   1.385 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_G1,		\
   1.386 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCBasher_ParOldGC,	\
   1.387 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_SerialGC,		\
   1.388 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParallelGC,	\
   1.389 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParNewGC,		\
   1.390 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_CMS,		\
   1.391 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_G1,		\
   1.392 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-GCOld_ParOldGC,		\
   1.393 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_default_nontiered,	\
   1.394 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_SerialGC,		\
   1.395 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_ParallelGC,		\
   1.396 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_CMS,		\
   1.397 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_G1,			\
   1.398 +    solaris_sparcv9_5.10-{product|fastdebug}-c2-jbb_ParOldGC
   1.399 +
   1.400 +my.test.targets.hotspot.solaris.x64=					\
   1.401 +    solaris_x64_5.10-{product|fastdebug}-c2-jvm98,			\
   1.402 +    solaris_x64_5.10-{product|fastdebug}-c2-jvm98_nontiered,		\
   1.403 +    solaris_x64_5.10-{product|fastdebug}-c2-scimark,			\
   1.404 +    solaris_x64_5.10-product-c2-runThese,				\
   1.405 +    solaris_x64_5.10-product-c2-runThese_Xcomp,				\
   1.406 +    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_SerialGC,		\
   1.407 +    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_ParallelGC,	\
   1.408 +    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
   1.409 +    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_CMS,		\
   1.410 +    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_G1,		\
   1.411 +    solaris_x64_5.10-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
   1.412 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_SerialGC,		\
   1.413 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParallelGC,		\
   1.414 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParNewGC,		\
   1.415 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_CMS,			\
   1.416 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_G1,			\
   1.417 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParOldGC,		\
   1.418 +    solaris_x64_5.10-{product|fastdebug}-c2-jbb_default_nontiered,	\
   1.419 +    solaris_x64_5.10-{product|fastdebug}-c2-jbb_SerialGC,		\
   1.420 +    solaris_x64_5.10-{product|fastdebug}-c2-jbb_ParallelGC,		\
   1.421 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_CMS,			\
   1.422 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_G1,			\
   1.423 +    solaris_x64_5.10-{product|fastdebug}-c2-GCOld_ParOldGC
   1.424 +
   1.425 +my.test.targets.hotspot.linux.i586=					\
   1.426 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98,			\
   1.427 +    linux_i586_2.6-{product|fastdebug}-c2-jvm98_nontiered,		\
   1.428 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-scimark,			\
   1.429 +    linux_i586_2.6-product-c1-runThese_Xcomp,				\
   1.430 +    linux_i586_2.6-fastdebug-c1-runThese_Xshare,			\
   1.431 +    linux_i586_2.6-fastdebug-c2-runThese_Xcomp,				\
   1.432 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
   1.433 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
   1.434 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC,	\
   1.435 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
   1.436 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1,		\
   1.437 +    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC,	\
   1.438 +    linux_i586_2.6-product-{c1|c2}-GCOld_SerialGC,			\
   1.439 +    linux_i586_2.6-product-{c1|c2}-GCOld_ParallelGC,			\
   1.440 +    linux_i586_2.6-product-{c1|c2}-GCOld_ParNewGC,			\
   1.441 +    linux_i586_2.6-product-{c1|c2}-GCOld_CMS,				\
   1.442 +    linux_i586_2.6-product-{c1|c2}-GCOld_G1,				\
   1.443 +    linux_i586_2.6-product-{c1|c2}-GCOld_ParOldGC,			\
   1.444 +    linux_i586_2.6-{product|fastdebug}-c1-jbb_SerialGC,			\
   1.445 +    linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered,	\
   1.446 +    linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC,		\
   1.447 +    linux_i586_2.6-{product|fastdebug}-c1-jbb_CMS,			\
   1.448 +    linux_i586_2.6-{product|fastdebug}-c1-jbb_G1,			\
   1.449 +    linux_i586_2.6-{product|fastdebug}-c1-jbb_ParOldGC
   1.450 +
   1.451 +my.test.targets.hotspot.linux.x64=					\
   1.452 +    linux_x64_2.6-{product|fastdebug}-c2-jvm98,				\
   1.453 +    linux_x64_2.6-{product|fastdebug}-c2-jvm98_nontiered,		\
   1.454 +    linux_x64_2.6-{product|fastdebug}-c2-scimark,			\
   1.455 +    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC,		\
   1.456 +    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
   1.457 +    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
   1.458 +    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS,			\
   1.459 +    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1,			\
   1.460 +    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
   1.461 +    linux_x64_2.6-{product|fastdebug}-c2-GCOld_SerialGC,		\
   1.462 +    linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParallelGC,		\
   1.463 +    linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParNewGC,		\
   1.464 +    linux_x64_2.6-{product|fastdebug}-c2-GCOld_CMS,			\
   1.465 +    linux_x64_2.6-{product|fastdebug}-c2-GCOld_G1,			\
   1.466 +    linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParOldGC,		\
   1.467 +    linux_x64_2.6-{product|fastdebug}-c2-jbb_default_nontiered,		\
   1.468 +    linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC,		\
   1.469 +    linux_x64_2.6-{product|fastdebug}-c2-jbb_G1,			\
   1.470 +    linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
   1.471 +
   1.472 +my.test.targets.hotspot.macosx.x64=					\
   1.473 +    macosx_x64_10.7-{product|fastdebug}-c2-jvm98,			\
   1.474 +    macosx_x64_10.7-{product|fastdebug}-c2-jvm98_nontiered,		\
   1.475 +    macosx_x64_10.7-{product|fastdebug}-c2-scimark,			\
   1.476 +    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC,		\
   1.477 +    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
   1.478 +    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
   1.479 +    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS,		\
   1.480 +    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1,			\
   1.481 +    macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
   1.482 +    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_SerialGC,		\
   1.483 +    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParallelGC,		\
   1.484 +    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParNewGC,		\
   1.485 +    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_CMS,			\
   1.486 +    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_G1,			\
   1.487 +    macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParOldGC,		\
   1.488 +    macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered,	\
   1.489 +    macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC,		\
   1.490 +    macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1,			\
   1.491 +    macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParOldGC
   1.492 +
   1.493 +my.test.targets.hotspot.windows.i586=					\
   1.494 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98,			\
   1.495 +    windows_i586_6.1-{product|fastdebug}-c2-jvm98_nontiered,		\
   1.496 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-scimark,		\
   1.497 +    windows_i586_6.1-product-{c1|c2}-runThese,				\
   1.498 +    windows_i586_6.1-product-{c1|c2}-runThese_Xcomp,			\
   1.499 +    windows_i586_6.1-fastdebug-c1-runThese_Xshare,			\
   1.500 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
   1.501 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
   1.502 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC,	\
   1.503 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
   1.504 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1,		\
   1.505 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC,	\
   1.506 +    windows_i586_6.1-product-{c1|c2}-GCOld_SerialGC,			\
   1.507 +    windows_i586_6.1-product-{c1|c2}-GCOld_ParallelGC,			\
   1.508 +    windows_i586_6.1-product-{c1|c2}-GCOld_ParNewGC,			\
   1.509 +    windows_i586_6.1-product-{c1|c2}-GCOld_CMS,				\
   1.510 +    windows_i586_6.1-product-{c1|c2}-GCOld_G1,				\
   1.511 +    windows_i586_6.1-product-{c1|c2}-GCOld_ParOldGC,			\
   1.512 +    windows_i586_6.1-{product|fastdebug}-{c1|c2}-jbb_default,		\
   1.513 +    windows_i586_6.1-{product|fastdebug}-c2-jbb_default_nontiered,	\
   1.514 +    windows_i586_6.1-product-{c1|c2}-jbb_ParallelGC,			\
   1.515 +    windows_i586_6.1-product-{c1|c2}-jbb_CMS,				\
   1.516 +    windows_i586_6.1-product-{c1|c2}-jbb_G1,				\
   1.517 +    windows_i586_6.1-product-{c1|c2}-jbb_ParOldGC
   1.518 +
   1.519 +my.test.targets.hotspot.windows.x64=					\
   1.520 +    windows_x64_6.1-{product|fastdebug}-c2-jvm98,			\
   1.521 +    windows_x64_6.1-{product|fastdebug}-c2-jvm98_nontiered,		\
   1.522 +    windows_x64_6.1-{product|fastdebug}-c2-scimark,			\
   1.523 +    windows_x64_6.1-product-c2-runThese,				\
   1.524 +    windows_x64_6.1-product-c2-runThese_Xcomp,				\
   1.525 +    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC,		\
   1.526 +    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
   1.527 +    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParNewGC,		\
   1.528 +    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS,		\
   1.529 +    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1,			\
   1.530 +    windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
   1.531 +    windows_x64_6.1-{product|fastdebug}-c2-GCOld_SerialGC,		\
   1.532 +    windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParallelGC,		\
   1.533 +    windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParNewGC,		\
   1.534 +    windows_x64_6.1-{product|fastdebug}-c2-GCOld_CMS,			\
   1.535 +    windows_x64_6.1-{product|fastdebug}-c2-GCOld_G1,			\
   1.536 +    windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParOldGC,		\
   1.537 +    windows_x64_6.1-{product|fastdebug}-c2-jbb_default,			\
   1.538 +    windows_x64_6.1-{product|fastdebug}-c2-jbb_default_nontiered,	\
   1.539 +    windows_x64_6.1-product-c2-jbb_CMS,					\
   1.540 +    windows_x64_6.1-product-c2-jbb_ParallelGC,				\
   1.541 +    windows_x64_6.1-product-c2-jbb_G1,					\
   1.542 +    windows_x64_6.1-product-c2-jbb_ParOldGC
   1.543 +
   1.544 +# Some basic "smoke" tests for OpenJDK builds
   1.545 +my.test.targets.hotspot.open=						\
   1.546 +    solaris_x64_5.10-{productOpen|fastdebugOpen}-c2-jvm98,		\
   1.547 +    linux_x64_2.6-{productOpen|fastdebugOpen}-c2-jvm98
   1.548 +
   1.549 +# The complete list of test targets for jprt
   1.550 +my.test.targets.hotspot=						\
   1.551 +  ${my.test.targets.hotspot.open},					\
   1.552 +  ${my.test.targets.hotspot.solaris.sparcv9},				\
   1.553 +  ${my.test.targets.hotspot.solaris.x64},				\
   1.554 +  ${my.test.targets.hotspot.linux.i586},				\
   1.555 +  ${my.test.targets.hotspot.linux.x64},					\
   1.556 +  ${my.test.targets.hotspot.macosx.x64},				\
   1.557 +  ${my.test.targets.hotspot.windows.i586},				\
   1.558 +  ${my.test.targets.hotspot.windows.x64},				\
   1.559 +  ${my.test.targets.hotspot.solaris.sparcv9},				\
   1.560 +  ${my.test.targets.hotspot.solaris.x64},				\
   1.561 +  ${my.test.targets.hotspot.linux.x64},					\
   1.562 +  ${my.test.targets.hotspot.windows.i586},				\
   1.563 +  ${my.test.targets.hotspot.windows.x64},				\
   1.564 +  ${my.additional.test.targets.hotspot}
   1.565 +
   1.566 +
   1.567 +# Make file based test targets
   1.568 +
   1.569 +my.make.rule.test.targets.hotspot.clienttests=				\
   1.570 +  linux_i586_2.6-*-c1-hotspot_clienttest,				\
   1.571 +  windows_i586_6.1-*-c1-hotspot_clienttest
   1.572 +
   1.573 +my.make.rule.test.targets.hotspot.servertests=				\
   1.574 +  solaris_sparcv9_5.10-*-c2-hotspot_servertest,				\
   1.575 +  solaris_x64_5.10-*-c2-hotspot_servertest,				\
   1.576 +  linux_i586_2.6-*-c2-hotspot_servertest,				\
   1.577 +  linux_x64_2.6-*-c2-hotspot_servertest,				\
   1.578 +  macosx_x64_10.7-*-c2-hotspot_servertest,				\
   1.579 +  windows_i586_6.1-*-c2-hotspot_servertest,				\
   1.580 +  windows_x64_6.1-*-c2-hotspot_servertest
   1.581 +
   1.582 +my.make.rule.test.targets.hotspot.internalvmtests=			\
   1.583 +  solaris_sparcv9_5.10-fastdebug-c2-hotspot_internalvmtests,		\
   1.584 +  solaris_x64_5.10-fastdebug-c2-hotspot_internalvmtests,		\
   1.585 +  linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests,			\
   1.586 +  linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests,			\
   1.587 +  macosx_x64_10.7-fastdebug-c2-hotspot_internalvmtests,			\
   1.588 +  windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests,		\
   1.589 +  windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
   1.590 +
   1.591 +my.make.rule.test.targets.hotspot.wbapitests=				\
   1.592 +  solaris_sparcv9_5.10-{product|fastdebug}-c2-hotspot_wbapitest,	\
   1.593 +  solaris_x64_5.10-{product|fastdebug}-c2-hotspot_wbapitest,		\
   1.594 +  linux_i586_2.6-{product|fastdebug}-c2-hotspot_wbapitest,		\
   1.595 +  linux_x64_2.6-{product|fastdebug}-c2-hotspot_wbapitest,		\
   1.596 +  windows_i586_6.1-{product|fastdebug}-c2-hotspot_wbapitest,		\
   1.597 +  windows_x64_6.1-{product|fastdebug}-c2-hotspot_wbapitest,		\
   1.598 +  linux_i586_2.6-{product|fastdebug}-c1-hotspot_wbapitest,		\
   1.599 +  windows_i586_6.1-{product|fastdebug}-c1-hotspot_wbapitest
   1.600 +
   1.601 +my.make.rule.test.targets.hotspot=					\
   1.602 +  ${my.make.rule.test.targets.hotspot.clienttests},			\
   1.603 +  ${my.make.rule.test.targets.hotspot.servertests},			\
   1.604 +  ${my.make.rule.test.targets.hotspot.internalvmtests},			\
   1.605 +  ${my.make.rule.test.targets.hotspot.wbapitests},			\
   1.606 +  ${my.additional.make.rule.test.targets.hotspot}

mercurial