8129615: Remove jbb from jprt hotspot testset
Reviewed-by: gtriantafill, coleenp
diff --git a/make/jprt.properties b/make/jprt.properties
index c24a28f..aeed335 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -281,12 +281,7 @@
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_CMS, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_G1
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.solaris.x64= \
solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \
@@ -298,10 +293,7 @@
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
- solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1, \
- solaris_x64_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \
- solaris_x64_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
- solaris_x64_5.11-{product|fastdebug}-c2-jbb_ParallelGC,
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.linux.i586= \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -315,12 +307,7 @@
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
- linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_SerialGC, \
- linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_CMS, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_G1
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1
my.test.targets.hotspot.linux.x64= \
linux_x64_2.6-{product|fastdebug}-c2-jvm98, \
@@ -329,10 +316,7 @@
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS, \
- linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_G1
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.macosx.x64= \
macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \
@@ -341,10 +325,7 @@
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_SerialGC, \
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC, \
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS, \
- macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.windows.i586= \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -357,12 +338,7 @@
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
- windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
- windows_i586_6.2-{product|fastdebug}-{c1|c2}-jbb_default, \
- windows_i586_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
- windows_i586_6.2-product-{c1|c2}-jbb_ParallelGC, \
- windows_i586_6.2-product-{c1|c2}-jbb_CMS, \
- windows_i586_6.2-product-{c1|c2}-jbb_G1
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1
my.test.targets.hotspot.windows.x64= \
windows_x64_6.2-{product|fastdebug}-c2-jvm98, \
@@ -374,12 +350,7 @@
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_SerialGC, \
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParallelGC, \
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_CMS, \
- windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1, \
- windows_x64_6.2-{product|fastdebug}-c2-jbb_default, \
- windows_x64_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
- windows_x64_6.2-product-c2-jbb_CMS, \
- windows_x64_6.2-product-c2-jbb_ParallelGC, \
- windows_x64_6.2-product-c2-jbb_G1
+ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1
# Some basic "smoke" tests for OpenJDK builds
my.test.targets.hotspot.open= \