--- a/make/jprt.properties Wed Mar 23 20:12:31 2016 +0100
+++ b/make/jprt.properties Wed Mar 30 11:15:53 2016 -0400
@@ -311,13 +311,13 @@
# Platforms built for hotspot push jobs
my.build.targets.hotspot= \
- solaris_sparcv9_5.11-{product|fastdebug}, \
+ solaris_sparcv9_5.11-{product|fastdebug}, \
solaris_x64_5.11-{product|fastdebug}, \
linux_i586_3.8-{product|fastdebug}, \
- linux_x64_3.8-{product|fastdebug}, \
+ linux_x64_3.8-{product|fastdebug}, \
macosx_x64_10.9-{product|fastdebug}, \
windows_i586_6.3-{product|fastdebug}, \
- windows_x64_6.3-{product|fastdebug}, \
+ windows_x64_6.3-{product|fastdebug}, \
solaris_x64_5.11-{fastdebugOpen}, \
linux_x64_3.8-{productOpen}, \
${my.additional.build.targets.hotspot}
@@ -346,18 +346,15 @@
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.linux.i586= \
- linux_i586_3.8-{product|fastdebug}-{c1|c2}-jvm98, \
+ linux_i586_3.8-{product|fastdebug}-c2-jvm98, \
linux_i586_3.8-{product|fastdebug}-c2-jvm98_nontiered, \
- linux_i586_3.8-{product|fastdebug}-{c1|c2}-scimark, \
- linux_i586_3.8-product-c1-runThese8_Xcomp_lang, \
- linux_i586_3.8-product-c1-runThese8_Xcomp_vm, \
- linux_i586_3.8-fastdebug-c1-runThese8_Xshare, \
+ linux_i586_3.8-{product|fastdebug}-c2-scimark, \
linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_lang, \
linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_vm, \
- linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
- linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
- linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
- linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_G1
+ linux_i586_3.8-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ linux_i586_3.8-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ linux_i586_3.8-{product|fastdebug}-c2-GCBasher_CMS, \
+ linux_i586_3.8-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.linux.x64= \
linux_x64_3.8-{product|fastdebug}-c2-jvm98, \
@@ -378,17 +375,16 @@
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.windows.i586= \
- windows_i586_6.3-{product|fastdebug}-{c1|c2}-jvm98, \
+ windows_i586_6.3-{product|fastdebug}-c2-jvm98, \
windows_i586_6.3-{product|fastdebug}-c2-jvm98_nontiered, \
- windows_i586_6.3-{product|fastdebug}-{c1|c2}-scimark, \
- windows_i586_6.3-product-{c1|c2}-runThese8, \
- windows_i586_6.3-product-{c1|c2}-runThese8_Xcomp_lang, \
- windows_i586_6.3-product-{c1|c2}-runThese8_Xcomp_vm, \
- windows_i586_6.3-fastdebug-c1-runThese8_Xshare, \
- windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
- windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
- windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
- windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_G1
+ windows_i586_6.3-{product|fastdebug}-c2-scimark, \
+ windows_i586_6.3-product-c2-runThese8, \
+ windows_i586_6.3-product-c2-runThese8_Xcomp_lang, \
+ windows_i586_6.3-product-c2-runThese8_Xcomp_vm, \
+ windows_i586_6.3-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ windows_i586_6.3-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ windows_i586_6.3-{product|fastdebug}-c2-GCBasher_CMS, \
+ windows_i586_6.3-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.windows.x64= \
windows_x64_6.3-{product|fastdebug}-c2-jvm98, \
@@ -443,9 +439,7 @@
linux_x64_3.8-fastdebug-c2-GROUP, \
macosx_x64_10.9-fastdebug-c2-GROUP, \
windows_i586_6.3-fastdebug-c2-GROUP, \
- windows_x64_6.3-fastdebug-c2-GROUP, \
- linux_i586_3.8-fastdebug-c1-GROUP, \
- windows_i586_6.3-fastdebug-c1-GROUP
+ windows_x64_6.3-fastdebug-c2-GROUP
# Hotspot jtreg tests
my.make.rule.test.targets.hotspot.reg= \