8029941: rollback changes in make/jprt.properties for embedded testing

Summary: cleanup changes merged by accident
Reviewed-by: roland, dholmes

make/jprt.properties

@@ -329,81 +329,9 @@ jprt.my.linux.i586.test.targets.embedded = \
 
 # The complete list of test targets for jprt
 # Note: no PPC or ARM tests at this stage
-jprt.my.linux.armvfpsflt.test.targets.embedded = \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-scimark, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_default, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_SerialGC, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParallelGC, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParNewGC, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_CMS, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_G1, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParOldGC, \
-    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_default, \
-    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_SerialGC, \
-    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_ParallelGC, \
-    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_ParNewGC, \
-    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_CMS, \
-    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_G1, \
-    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_ParOldGC, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_default, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c2-jbb_default_nontiered, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParallelGC, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_CMS, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_G1, \
-    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParOldGC
-
-# QEMU Emulators for ARM VFP HFLT
-jprt.my.linux.armvfphflt.test.targets.embedded = \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-scimark, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_default, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_SerialGC, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParallelGC, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParNewGC, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_CMS, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_G1, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParOldGC, \
-    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_default, \
-    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_SerialGC, \
-    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_ParallelGC, \
-    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_ParNewGC, \
-    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_CMS, \
-    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_G1, \
-    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_ParOldGC, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_default, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c2-jbb_default_nontiered, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParallelGC, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_CMS, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_G1, \
-    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParOldGC
-
-jprt.my.linux.ppc.test.targets.embedded = \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-scimark, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_default, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_SerialGC, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParallelGC, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParNewGC, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_CMS, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_G1, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParOldGC, \
-    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_default, \
-    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_SerialGC, \
-    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_ParallelGC, \
-    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_ParNewGC, \
-    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_CMS, \
-    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_G1, \
-    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_ParOldGC, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_default, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-c2-jbb_default_nontiered, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParallelGC, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_CMS, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_G1, \
-    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParOldGC
 
 jprt.test.targets.standard = \
   ${jprt.my.linux.i586.test.targets.embedded}, \
-  ${jprt.my.linux.armvfpsflt.test.targets.embedded}, \
-  ${jprt.my.linux.armvfphflt.test.targets.embedded}, \
-  ${jprt.my.linux.ppc.test.targets.embedded}, \
   ${jprt.my.solaris.sparcv9.test.targets}, \
   ${jprt.my.solaris.x64.test.targets}, \
   ${jprt.my.linux.i586.test.targets}, \