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

Tue, 28 Jan 2014 10:19:45 -0800

author
kvn
date
Tue, 28 Jan 2014 10:19:45 -0800
changeset 6523
23262dd70c13
parent 6522
3a55cf1e3c9f
child 6524
3829d0343db0
child 6526
75ad4240c15c

8029941: rollback changes in make/jprt.properties for embedded testing
Summary: cleanup changes merged by accident
Reviewed-by: roland, dholmes

make/jprt.properties file | annotate | diff | comparison | revisions
     1.1 --- a/make/jprt.properties	Thu Feb 27 20:40:24 2014 +0100
     1.2 +++ b/make/jprt.properties	Tue Jan 28 10:19:45 2014 -0800
     1.3 @@ -329,81 +329,9 @@
     1.4  
     1.5  # The complete list of test targets for jprt
     1.6  # Note: no PPC or ARM tests at this stage
     1.7 -jprt.my.linux.armvfpsflt.test.targets.embedded = \
     1.8 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-scimark, \
     1.9 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_default, \
    1.10 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_SerialGC, \
    1.11 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParallelGC, \
    1.12 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParNewGC, \
    1.13 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_CMS, \
    1.14 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_G1, \
    1.15 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParOldGC, \
    1.16 -    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_default, \
    1.17 -    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_SerialGC, \
    1.18 -    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_ParallelGC, \
    1.19 -    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_ParNewGC, \
    1.20 -    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_CMS, \
    1.21 -    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_G1, \
    1.22 -    linux_armvfpsflt_2.6-productEmb-{c1|c2}-GCOld_ParOldGC, \
    1.23 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_default, \
    1.24 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c2-jbb_default_nontiered, \
    1.25 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParallelGC, \
    1.26 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_CMS, \
    1.27 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_G1, \
    1.28 -    linux_armvfpsflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParOldGC
    1.29 -
    1.30 -# QEMU Emulators for ARM VFP HFLT
    1.31 -jprt.my.linux.armvfphflt.test.targets.embedded = \
    1.32 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-scimark, \
    1.33 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_default, \
    1.34 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_SerialGC, \
    1.35 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParallelGC, \
    1.36 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParNewGC, \
    1.37 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_CMS, \
    1.38 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_G1, \
    1.39 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParOldGC, \
    1.40 -    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_default, \
    1.41 -    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_SerialGC, \
    1.42 -    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_ParallelGC, \
    1.43 -    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_ParNewGC, \
    1.44 -    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_CMS, \
    1.45 -    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_G1, \
    1.46 -    linux_armvfphflt_2.6-productEmb-{c1|c2}-GCOld_ParOldGC, \
    1.47 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_default, \
    1.48 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c2-jbb_default_nontiered, \
    1.49 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParallelGC, \
    1.50 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_CMS, \
    1.51 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_G1, \
    1.52 -    linux_armvfphflt_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParOldGC
    1.53 -
    1.54 -jprt.my.linux.ppc.test.targets.embedded = \
    1.55 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-scimark, \
    1.56 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_default, \
    1.57 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_SerialGC, \
    1.58 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParallelGC, \
    1.59 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParNewGC, \
    1.60 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_CMS, \
    1.61 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_G1, \
    1.62 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-{c1|c2}-GCBasher_ParOldGC, \
    1.63 -    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_default, \
    1.64 -    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_SerialGC, \
    1.65 -    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_ParallelGC, \
    1.66 -    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_ParNewGC, \
    1.67 -    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_CMS, \
    1.68 -    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_G1, \
    1.69 -    linux_ppc_2.6-productEmb-{c1|c2}-GCOld_ParOldGC, \
    1.70 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_default, \
    1.71 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-c2-jbb_default_nontiered, \
    1.72 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParallelGC, \
    1.73 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_CMS, \
    1.74 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_G1, \
    1.75 -    linux_ppc_2.6-{productEmb|fastdebugEmb}-c1-jbb_ParOldGC
    1.76  
    1.77  jprt.test.targets.standard = \
    1.78    ${jprt.my.linux.i586.test.targets.embedded}, \
    1.79 -  ${jprt.my.linux.armvfpsflt.test.targets.embedded}, \
    1.80 -  ${jprt.my.linux.armvfphflt.test.targets.embedded}, \
    1.81 -  ${jprt.my.linux.ppc.test.targets.embedded}, \
    1.82    ${jprt.my.solaris.sparcv9.test.targets}, \
    1.83    ${jprt.my.solaris.x64.test.targets}, \
    1.84    ${jprt.my.linux.i586.test.targets}, \

mercurial