make/jprt.properties

@@ -344,22 +344,19 @@
     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
 
 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,                         \
     linux_x64_3.8-{product|fastdebug}-c2-jvm98_nontiered,               \
     linux_x64_3.8-{product|fastdebug}-c2-scimark,                       \

@@ -376,21 +373,20 @@
     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
 
 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,                       \
     windows_x64_6.3-{product|fastdebug}-c2-jvm98_nontiered,             \
     windows_x64_6.3-{product|fastdebug}-c2-scimark,                     \

@@ -441,13 +437,11 @@
   solaris_x64_5.11-fastdebug-c2-GROUP,                                  \
   linux_i586_3.8-fastdebug-c2-GROUP,                                    \
   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=                                          \
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1},      \
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2},      \