# HG changeset patch # User katleman # Date 1382543436 25200 # Node ID 54150586ba785e1eb0c0de8d13906f643f640644 # Parent bca97b47f0a2c9ef3101d037de7bdec9c7408fb6# Parent 127c2e74d2cf79485f8f6447d00c6c56a80c9617 Merge diff -r bca97b47f0a2 -r 54150586ba78 make/jprt.properties --- a/make/jprt.properties Thu Oct 17 16:13:39 2013 -0700 +++ b/make/jprt.properties Wed Oct 23 08:50:36 2013 -0700 @@ -33,9 +33,7 @@ # Standard list of jprt build targets for this source tree jprt.build.targets= \ - solaris_sparc_5.10-{product|fastdebug}, \ solaris_sparcv9_5.10-{product|fastdebug}, \ - solaris_i586_5.10-{product|fastdebug}, \ solaris_x64_5.10-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \ @@ -45,9 +43,7 @@ # Test target list (no fastdebug & limited c2 testing) jprt.my.test.target.set= \ - solaris_sparc_5.10-product-c1-TESTNAME, \ solaris_sparcv9_5.10-product-c2-TESTNAME, \ - solaris_i586_5.10-product-c1-TESTNAME, \ solaris_x64_5.10-product-c2-TESTNAME, \ linux_i586_2.6-product-{c1|c2}-TESTNAME, \ linux_x64_2.6-product-c2-TESTNAME, \ @@ -64,9 +60,7 @@ # Test target list (no fastdebug & limited c2 testing) jprt.my.test.target.set= \ - solaris_sparc_5.10-product-c1-TESTNAME, \ solaris_sparcv9_5.10-product-c2-TESTNAME, \ - solaris_i586_5.10-product-c1-TESTNAME, \ solaris_x64_5.10-product-c2-TESTNAME, \ linux_i586_2.6-product-{c1|c2}-TESTNAME, \ linux_x64_2.6-product-c2-TESTNAME, \