1.1 --- a/make/jprt.properties Sat Oct 19 08:52:21 2013 -0700
1.2 +++ b/make/jprt.properties Mon Oct 21 14:38:11 2013 -0700
1.3 @@ -24,12 +24,7 @@
1.4
1.5 # Properties for jprt
1.6
1.7 -# All build result bundles are full jdks, so the 64bit testing does not
1.8 -# need the 32bit sibling bundle installed.
1.9 -# Note: If the hotspot/make/Makefile changed to only bundle the 64bit files
1.10 -# when bundling 64bit, and stripped out the 64bit files from any 32bit
1.11 -# bundles, then this setting would be need to be "true".
1.12 -
1.13 +# All build result bundles are full jdks.
1.14 jprt.need.sibling.build=false
1.15
1.16 # At submit time, the release supplied will be in jprt.submit.release
1.17 @@ -52,21 +47,11 @@
1.18 # sparc etc.
1.19
1.20 # Define the Solaris platforms we want for the various releases
1.21 -jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
1.22 -jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
1.23 -jprt.my.solaris.sparc.jdk7u8=${jprt.my.solaris.sparc.jdk7}
1.24 -jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
1.25 -
1.26 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
1.27 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
1.28 jprt.my.solaris.sparcv9.jdk7u8=${jprt.my.solaris.sparcv9.jdk7}
1.29 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
1.30
1.31 -jprt.my.solaris.i586.jdk8=solaris_i586_5.10
1.32 -jprt.my.solaris.i586.jdk7=solaris_i586_5.10
1.33 -jprt.my.solaris.i586.jdk7u8=${jprt.my.solaris.i586.jdk7}
1.34 -jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
1.35 -
1.36 jprt.my.solaris.x64.jdk8=solaris_x64_5.10
1.37 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
1.38 jprt.my.solaris.x64.jdk7u8=${jprt.my.solaris.x64.jdk7}
1.39 @@ -133,9 +118,7 @@
1.40 # Standard list of jprt build targets for this source tree
1.41
1.42 jprt.build.targets.standard= \
1.43 - ${jprt.my.solaris.sparc}-{product|fastdebug}, \
1.44 ${jprt.my.solaris.sparcv9}-{product|fastdebug|optimized}, \
1.45 - ${jprt.my.solaris.i586}-{product|fastdebug}, \
1.46 ${jprt.my.solaris.x64}-{product|fastdebug}, \
1.47 ${jprt.my.linux.i586}-{product|fastdebug}, \
1.48 ${jprt.my.linux.x64}-{product|fastdebug|optimized}, \
1.49 @@ -145,7 +128,6 @@
1.50 ${jprt.my.linux.armvh}-{product|fastdebug}
1.51
1.52 jprt.build.targets.open= \
1.53 - ${jprt.my.solaris.i586}-{productOpen}, \
1.54 ${jprt.my.solaris.x64}-{debugOpen}, \
1.55 ${jprt.my.linux.x64}-{productOpen}
1.56
1.57 @@ -168,31 +150,6 @@
1.58
1.59 # Subset lists of test targets for this source tree
1.60
1.61 -jprt.my.solaris.sparc.test.targets= \
1.62 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jvm98, \
1.63 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jvm98_nontiered, \
1.64 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \
1.65 - ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \
1.66 - ${jprt.my.solaris.sparc}-fastdebug-c1-runThese_Xshare, \
1.67 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
1.68 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
1.69 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
1.70 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
1.71 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
1.72 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
1.73 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_SerialGC, \
1.74 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParallelGC, \
1.75 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParNewGC, \
1.76 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_CMS, \
1.77 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_G1, \
1.78 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParOldGC, \
1.79 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jbb_default_nontiered, \
1.80 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \
1.81 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \
1.82 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_CMS, \
1.83 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_G1, \
1.84 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParOldGC
1.85 -
1.86 jprt.my.solaris.sparcv9.test.targets= \
1.87 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98, \
1.88 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98_nontiered, \
1.89 @@ -242,37 +199,6 @@
1.90 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_G1, \
1.91 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParOldGC
1.92
1.93 -jprt.my.solaris.i586.test.targets= \
1.94 - ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
1.95 - ${jprt.my.solaris.i586}-{product|fastdebug}-c2-jvm98_nontiered, \
1.96 - ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark, \
1.97 - ${jprt.my.solaris.i586}-product-{c1|c2}-runThese_Xcomp, \
1.98 - ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xcomp, \
1.99 - ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xshare, \
1.100 - ${jprt.my.solaris.i586}-product-c1-GCBasher_SerialGC, \
1.101 - ${jprt.my.solaris.i586}-product-c1-GCBasher_ParallelGC, \
1.102 - ${jprt.my.solaris.i586}-product-c1-GCBasher_ParNewGC, \
1.103 - ${jprt.my.solaris.i586}-product-c1-GCBasher_CMS, \
1.104 - ${jprt.my.solaris.i586}-product-c1-GCBasher_G1, \
1.105 - ${jprt.my.solaris.i586}-product-c1-GCBasher_ParOldGC, \
1.106 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_SerialGC, \
1.107 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParallelGC, \
1.108 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParNewGC, \
1.109 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_CMS, \
1.110 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_G1, \
1.111 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParOldGC, \
1.112 - ${jprt.my.solaris.i586}-product-c1-GCOld_SerialGC, \
1.113 - ${jprt.my.solaris.i586}-product-c1-GCOld_ParallelGC, \
1.114 - ${jprt.my.solaris.i586}-product-c1-GCOld_ParNewGC, \
1.115 - ${jprt.my.solaris.i586}-product-c1-GCOld_CMS, \
1.116 - ${jprt.my.solaris.i586}-product-c1-GCOld_G1, \
1.117 - ${jprt.my.solaris.i586}-product-c1-GCOld_ParOldGC, \
1.118 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default_nontiered, \
1.119 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParallelGC, \
1.120 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_CMS, \
1.121 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_G1, \
1.122 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParOldGC
1.123 -
1.124 jprt.my.linux.i586.test.targets = \
1.125 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
1.126 ${jprt.my.linux.i586}-{product|fastdebug}-c2-jvm98_nontiered, \
1.127 @@ -395,7 +321,6 @@
1.128 # Some basic "smoke" tests for OpenJDK builds
1.129 jprt.test.targets.open = \
1.130 ${jprt.my.solaris.x64}-{productOpen|fastdebugOpen}-c2-jvm98, \
1.131 - ${jprt.my.solaris.i586}-{productOpen|fastdebugOpen}-c2-jvm98, \
1.132 ${jprt.my.linux.x64}-{productOpen|fastdebugOpen}-c2-jvm98
1.133
1.134 # Testing for actual embedded builds is different to standard
1.135 @@ -407,9 +332,7 @@
1.136
1.137 jprt.test.targets.standard = \
1.138 ${jprt.my.linux.i586.test.targets.embedded}, \
1.139 - ${jprt.my.solaris.sparc.test.targets}, \
1.140 ${jprt.my.solaris.sparcv9.test.targets}, \
1.141 - ${jprt.my.solaris.i586.test.targets}, \
1.142 ${jprt.my.solaris.x64.test.targets}, \
1.143 ${jprt.my.linux.i586.test.targets}, \
1.144 ${jprt.my.linux.x64.test.targets}, \
1.145 @@ -420,15 +343,12 @@
1.146
1.147 jprt.test.targets.embedded= \
1.148 ${jprt.my.linux.i586.test.targets.embedded}, \
1.149 - ${jprt.my.solaris.sparc.test.targets}, \
1.150 ${jprt.my.solaris.sparcv9.test.targets}, \
1.151 - ${jprt.my.solaris.i586.test.targets}, \
1.152 ${jprt.my.solaris.x64.test.targets}, \
1.153 ${jprt.my.linux.x64.test.targets}, \
1.154 ${jprt.my.windows.i586.test.targets}, \
1.155 ${jprt.my.windows.x64.test.targets}
1.156
1.157 -
1.158 jprt.test.targets.jdk8=${jprt.test.targets.standard}
1.159 jprt.test.targets.jdk7=${jprt.test.targets.standard}
1.160 jprt.test.targets.jdk7u8=${jprt.test.targets.jdk7}
1.161 @@ -439,15 +359,11 @@
1.162 #jprt.make.rule.test.targets=*-product-*-packtest
1.163
1.164 jprt.make.rule.test.targets.standard.client = \
1.165 - ${jprt.my.solaris.sparc}-*-c1-clienttest, \
1.166 - ${jprt.my.solaris.i586}-*-c1-clienttest, \
1.167 ${jprt.my.linux.i586}-*-c1-clienttest, \
1.168 ${jprt.my.windows.i586}-*-c1-clienttest
1.169
1.170 jprt.make.rule.test.targets.standard.server = \
1.171 - ${jprt.my.solaris.sparc}-*-c2-servertest, \
1.172 ${jprt.my.solaris.sparcv9}-*-c2-servertest, \
1.173 - ${jprt.my.solaris.i586}-*-c2-servertest, \
1.174 ${jprt.my.solaris.x64}-*-c2-servertest, \
1.175 ${jprt.my.linux.i586}-*-c2-servertest, \
1.176 ${jprt.my.linux.x64}-*-c2-servertest, \
1.177 @@ -456,9 +372,7 @@
1.178 ${jprt.my.windows.x64}-*-c2-servertest
1.179
1.180 jprt.make.rule.test.targets.standard.internalvmtests = \
1.181 - ${jprt.my.solaris.sparc}-fastdebug-c2-internalvmtests, \
1.182 ${jprt.my.solaris.sparcv9}-fastdebug-c2-internalvmtests, \
1.183 - ${jprt.my.solaris.i586}-fastdebug-c2-internalvmtests, \
1.184 ${jprt.my.solaris.x64}-fastdebug-c2-internalvmtests, \
1.185 ${jprt.my.linux.i586}-fastdebug-c2-internalvmtests, \
1.186 ${jprt.my.linux.x64}-fastdebug-c2-internalvmtests, \
1.187 @@ -467,16 +381,12 @@
1.188 ${jprt.my.windows.x64}-fastdebug-c2-internalvmtests
1.189
1.190 jprt.make.rule.test.targets.standard.wbapi = \
1.191 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-wbapitest, \
1.192 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-wbapitest, \
1.193 - ${jprt.my.solaris.i586}-{product|fastdebug}-c2-wbapitest, \
1.194 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-wbapitest, \
1.195 ${jprt.my.linux.i586}-{product|fastdebug}-c2-wbapitest, \
1.196 ${jprt.my.linux.x64}-{product|fastdebug}-c2-wbapitest, \
1.197 ${jprt.my.windows.i586}-{product|fastdebug}-c2-wbapitest, \
1.198 ${jprt.my.windows.x64}-{product|fastdebug}-c2-wbapitest, \
1.199 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c1-wbapitest, \
1.200 - ${jprt.my.solaris.i586}-{product|fastdebug}-c1-wbapitest, \
1.201 ${jprt.my.linux.i586}-{product|fastdebug}-c1-wbapitest, \
1.202 ${jprt.my.windows.i586}-{product|fastdebug}-c1-wbapitest
1.203
