1.1 --- a/make/jprt.properties Thu Jan 27 16:11:27 2011 -0800
1.2 +++ b/make/jprt.properties Wed Feb 02 11:35:26 2011 -0500
1.3 @@ -44,6 +44,11 @@
1.4
1.5 jprt.sync.push=false
1.6
1.7 +# Note: we want both embedded releases and regular releases to build and test
1.8 +# all platforms so that regressions are not introduced (eg. change to
1.9 +# common code by SE breaks PPC/ARM; change to common code by SE-E breaks
1.10 +# sparc etc.
1.11 +
1.12 # Define the Solaris platforms we want for the various releases
1.13
1.14 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
1.15 @@ -55,6 +60,8 @@
1.16 jprt.my.solaris.sparc.jdk6u14=solaris_sparc_5.8
1.17 jprt.my.solaris.sparc.jdk6u18=solaris_sparc_5.8
1.18 jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8
1.19 +jprt.my.solaris.sparc.ejdk7=${jprt.my.solaris.sparc.jdk7}
1.20 +jprt.my.solaris.sparc.ejdk6=${jprt.my.solaris.sparc.jdk6}
1.21 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
1.22
1.23 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
1.24 @@ -66,6 +73,8 @@
1.25 jprt.my.solaris.sparcv9.jdk6u14=solaris_sparcv9_5.8
1.26 jprt.my.solaris.sparcv9.jdk6u18=solaris_sparcv9_5.8
1.27 jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8
1.28 +jprt.my.solaris.sparcv9.ejdk7=${jprt.my.solaris.sparcv9.jdk7}
1.29 +jprt.my.solaris.sparcv9.ejdk6=${jprt.my.solaris.sparcv9.jdk6}
1.30 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
1.31
1.32 jprt.my.solaris.i586.jdk7=solaris_i586_5.10
1.33 @@ -77,6 +86,8 @@
1.34 jprt.my.solaris.i586.jdk6u14=solaris_i586_5.8
1.35 jprt.my.solaris.i586.jdk6u18=solaris_i586_5.8
1.36 jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8
1.37 +jprt.my.solaris.i586.ejdk7=${jprt.my.solaris.i586.jdk7}
1.38 +jprt.my.solaris.i586.ejdk6=${jprt.my.solaris.i586.jdk6}
1.39 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
1.40
1.41 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
1.42 @@ -88,6 +99,8 @@
1.43 jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10
1.44 jprt.my.solaris.x64.jdk6u18=solaris_x64_5.10
1.45 jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10
1.46 +jprt.my.solaris.x64.ejdk7=${jprt.my.solaris.x64.jdk7}
1.47 +jprt.my.solaris.x64.ejdk6=${jprt.my.solaris.x64.jdk6}
1.48 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
1.49
1.50 jprt.my.linux.i586.jdk7=linux_i586_2.6
1.51 @@ -99,6 +112,8 @@
1.52 jprt.my.linux.i586.jdk6u14=linux_i586_2.4
1.53 jprt.my.linux.i586.jdk6u18=linux_i586_2.4
1.54 jprt.my.linux.i586.jdk6u20=linux_i586_2.4
1.55 +jprt.my.linux.i586.ejdk7=linux_i586_2.6
1.56 +jprt.my.linux.i586.ejdk6=linux_i586_2.6
1.57 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
1.58
1.59 jprt.my.linux.x64.jdk7=linux_x64_2.6
1.60 @@ -110,8 +125,45 @@
1.61 jprt.my.linux.x64.jdk6u14=linux_x64_2.4
1.62 jprt.my.linux.x64.jdk6u18=linux_x64_2.4
1.63 jprt.my.linux.x64.jdk6u20=linux_x64_2.4
1.64 +jprt.my.linux.x64.ejdk7=${jprt.my.linux.x64.jdk7}
1.65 +jprt.my.linux.x64.ejdk6=${jprt.my.linux.x64.jdk6}
1.66 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
1.67
1.68 +jprt.my.linux.ppc.jdk7=linux_ppc_2.6
1.69 +jprt.my.linux.ppc.jdk7b107=linux_ppc_2.6
1.70 +jprt.my.linux.ppc.jdk7temp=linux_ppc_2.6
1.71 +jprt.my.linux.ppc.ejdk6=linux_ppc_2.6
1.72 +jprt.my.linux.ppc.ejdk7=linux_ppc_2.6
1.73 +jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
1.74 +
1.75 +jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
1.76 +jprt.my.linux.ppcv2.jdk7b107=linux_ppcv2_2.6
1.77 +jprt.my.linux.ppcv2.jdk7temp=linux_ppcv2_2.6
1.78 +jprt.my.linux.ppcv2.ejdk6=linux_ppcv2_2.6
1.79 +jprt.my.linux.ppcv2.ejdk7=linux_ppcv2_2.6
1.80 +jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
1.81 +
1.82 +jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
1.83 +jprt.my.linux.ppcsflt.jdk7b107=linux_ppcsflt_2.6
1.84 +jprt.my.linux.ppcsflt.jdk7temp=linux_ppcsflt_2.6
1.85 +jprt.my.linux.ppcsflt.ejdk6=linux_ppcsflt_2.6
1.86 +jprt.my.linux.ppcsflt.ejdk7=linux_ppcsflt_2.6
1.87 +jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
1.88 +
1.89 +jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
1.90 +jprt.my.linux.armvfp.jdk7b107=linux_armvfp_2.6
1.91 +jprt.my.linux.armvfp.jdk7temp=linux_armvfp_2.6
1.92 +jprt.my.linux.armvfp.ejdk6=linux_armvfp_2.6
1.93 +jprt.my.linux.armvfp.ejdk7=linux_armvfp_2.6
1.94 +jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
1.95 +
1.96 +jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
1.97 +jprt.my.linux.armsflt.jdk7b107=linux_armsflt_2.6
1.98 +jprt.my.linux.armsflt.jdk7temp=linux_armsflt_2.6
1.99 +jprt.my.linux.armsflt.ejdk6=linux_armsflt_2.6
1.100 +jprt.my.linux.armsflt.ejdk7=linux_armsflt_2.6
1.101 +jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
1.102 +
1.103 jprt.my.windows.i586.jdk7=windows_i586_5.1
1.104 jprt.my.windows.i586.jdk7b107=windows_i586_5.0
1.105 jprt.my.windows.i586.jdk7temp=windows_i586_5.0
1.106 @@ -121,6 +173,8 @@
1.107 jprt.my.windows.i586.jdk6u14=windows_i586_5.0
1.108 jprt.my.windows.i586.jdk6u18=windows_i586_5.0
1.109 jprt.my.windows.i586.jdk6u20=windows_i586_5.0
1.110 +jprt.my.windows.i586.ejdk7=${jprt.my.windows.i586.jdk7}
1.111 +jprt.my.windows.i586.ejdk6=${jprt.my.windows.i586.jdk6}
1.112 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
1.113
1.114 jprt.my.windows.x64.jdk7=windows_x64_5.2
1.115 @@ -132,11 +186,13 @@
1.116 jprt.my.windows.x64.jdk6u14=windows_x64_5.2
1.117 jprt.my.windows.x64.jdk6u18=windows_x64_5.2
1.118 jprt.my.windows.x64.jdk6u20=windows_x64_5.2
1.119 +jprt.my.windows.x64.ejdk7=${jprt.my.windows.x64.jdk7}
1.120 +jprt.my.windows.x64.ejdk6=${jprt.my.windows.x64.jdk6}
1.121 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
1.122
1.123 # Standard list of jprt build targets for this source tree
1.124
1.125 -jprt.build.targets= \
1.126 +jprt.build.targets.standard= \
1.127 ${jprt.my.solaris.sparc}-{product|fastdebug|debug}, \
1.128 ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \
1.129 ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \
1.130 @@ -146,6 +202,30 @@
1.131 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
1.132 ${jprt.my.windows.x64}-{product|fastdebug|debug}
1.133
1.134 +jprt.build.targets.embedded= \
1.135 + ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
1.136 + ${jprt.my.linux.ppc}-{product|fastdebug}, \
1.137 + ${jprt.my.linux.ppcv2}-{product|fastdebug}, \
1.138 + ${jprt.my.linux.ppcsflt}-{product|fastdebug}, \
1.139 + ${jprt.my.linux.armvfp}-{product|fastdebug}, \
1.140 + ${jprt.my.linux.armsflt}-{product|fastdebug}
1.141 +
1.142 +jprt.build.targets.all=${jprt.build.targets.standard}, \
1.143 + ${jprt.build.targets.embedded}
1.144 +
1.145 +jprt.build.targets.jdk7=${jprt.build.targets.all}
1.146 +jprt.build.targets.jdk7temp=${jprt.build.targets.all}
1.147 +jprt.build.targets.jdk7b107=${jprt.build.targets.all}
1.148 +jprt.build.targets.jdk6=${jprt.build.targets.standard}
1.149 +jprt.build.targets.jdk6perf=${jprt.build.targets.standard}
1.150 +jprt.build.targets.jdk6u10=${jprt.build.targets.standard}
1.151 +jprt.build.targets.jdk6u14=${jprt.build.targets.standard}
1.152 +jprt.build.targets.jdk6u18=${jprt.build.targets.standard}
1.153 +jprt.build.targets.jdk6u20=${jprt.build.targets.standard}
1.154 +jprt.build.targets.ejdk6=${jprt.build.targets.all}
1.155 +jprt.build.targets.ejdk7=${jprt.build.targets.all}
1.156 +jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
1.157 +
1.158 # Subset lists of test targets for this source tree
1.159
1.160 jprt.my.solaris.sparc.test.targets= \
1.161 @@ -372,9 +452,14 @@
1.162 ${jprt.my.windows.x64}-product-c2-jbb_G1, \
1.163 ${jprt.my.windows.x64}-product-c2-jbb_ParOldGC
1.164
1.165 +# Testing for actual embedded builds is different to standard
1.166 +jprt.my.linux.i586.test.targets.embedded = \
1.167 + linux_i586_2.6-product-c1-scimark
1.168 +
1.169 # The complete list of test targets for jprt
1.170 +# Note: no PPC or ARM tests at this stage
1.171
1.172 -jprt.test.targets = \
1.173 +jprt.test.targets.standard = \
1.174 ${jprt.my.solaris.sparc.test.targets}, \
1.175 ${jprt.my.solaris.sparcv9.test.targets}, \
1.176 ${jprt.my.solaris.i586.test.targets}, \
1.177 @@ -384,15 +469,41 @@
1.178 ${jprt.my.windows.i586.test.targets}, \
1.179 ${jprt.my.windows.x64.test.targets}
1.180
1.181 +jprt.test.targets.embedded= \
1.182 + ${jprt.my.linux.i586.test.targets.embedded}, \
1.183 + ${jprt.my.solaris.sparc.test.targets}, \
1.184 + ${jprt.my.solaris.sparcv9.test.targets}, \
1.185 + ${jprt.my.solaris.i586.test.targets}, \
1.186 + ${jprt.my.solaris.x64.test.targets}, \
1.187 + ${jprt.my.linux.x64.test.targets}, \
1.188 + ${jprt.my.windows.i586.test.targets}, \
1.189 + ${jprt.my.windows.x64.test.targets}
1.190 +
1.191 +
1.192 +jprt.test.targets.jdk7=${jprt.test.targets.standard}
1.193 +jprt.test.targets.jdk7temp=${jprt.test.targets.standard}
1.194 +jprt.test.targets.jdk7b105=${jprt.test.targets.standard}
1.195 +jprt.test.targets.jdk6=${jprt.test.targets.standard}
1.196 +jprt.test.targets.jdk6perf=${jprt.test.targets.standard}
1.197 +jprt.test.targets.jdk6u10=${jprt.test.targets.standard}
1.198 +jprt.test.targets.jdk6u14=${jprt.test.targets.standard}
1.199 +jprt.test.targets.jdk6u18=${jprt.test.targets.standard}
1.200 +jprt.test.targets.jdk6u20=${jprt.test.targets.standard}
1.201 +jprt.test.targets.ejdk6=${jprt.test.targets.embedded}
1.202 +jprt.test.targets.ejdk7=${jprt.test.targets.embedded}
1.203 +jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
1.204 +
1.205 # The default test/Makefile targets that should be run
1.206
1.207 #jprt.make.rule.test.targets=*-product-*-packtest
1.208
1.209 -jprt.make.rule.test.targets = \
1.210 +jprt.make.rule.test.targets.standard.client = \
1.211 ${jprt.my.solaris.sparc}-*-c1-clienttest, \
1.212 ${jprt.my.solaris.i586}-*-c1-clienttest, \
1.213 ${jprt.my.linux.i586}-*-c1-clienttest, \
1.214 - ${jprt.my.windows.i586}-*-c1-clienttest, \
1.215 + ${jprt.my.windows.i586}-*-c1-clienttest
1.216 +
1.217 +jprt.make.rule.test.targets.standard.server = \
1.218 ${jprt.my.solaris.sparc}-*-c2-servertest, \
1.219 ${jprt.my.solaris.sparcv9}-*-c2-servertest, \
1.220 ${jprt.my.solaris.i586}-*-c2-servertest, \
1.221 @@ -402,3 +513,23 @@
1.222 ${jprt.my.windows.i586}-*-c2-servertest, \
1.223 ${jprt.my.windows.x64}-*-c2-servertest
1.224
1.225 +jprt.make.rule.test.targets.standard = \
1.226 + ${jprt.make.rule.test.targets.standard.client}, \
1.227 + ${jprt.make.rule.test.targets.standard.server}
1.228 +
1.229 +jprt.make.rule.test.targets.embedded = \
1.230 + ${jprt.make.rule.test.targets.standard.client}
1.231 +
1.232 +jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
1.233 +jprt.make.rule.test.targets.jdk7temp=${jprt.make.rule.test.targets.standard}
1.234 +jprt.make.rule.test.targets.jdk7b107=${jprt.make.rule.test.targets.standard}
1.235 +jprt.make.rule.test.targets.jdk6=${jprt.make.rule.test.targets.standard}
1.236 +jprt.make.rule.test.targets.jdk6perf=${jprt.make.rule.test.targets.standard}
1.237 +jprt.make.rule.test.targets.jdk6u10=${jprt.make.rule.test.targets.standard}
1.238 +jprt.make.rule.test.targets.jdk6u14=${jprt.make.rule.test.targets.standard}
1.239 +jprt.make.rule.test.targets.jdk6u18=${jprt.make.rule.test.targets.standard}
1.240 +jprt.make.rule.test.targets.jdk6u20=${jprt.make.rule.test.targets.standard}
1.241 +jprt.make.rule.test.targets.ejdk6=${jprt.make.rule.test.targets.embedded}
1.242 +jprt.make.rule.test.targets.ejdk7=${jprt.make.rule.test.targets.embedded}
1.243 +jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
1.244 +
