changeset 2170:44e3ba40e00c

Merge
author lana
date Mon, 28 Oct 2013 12:29:34 -0700
parents 860f1d21763a 850d2602ae98
children aa91bc6e8480
files
diffstat 2 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 24 16:52:27 2013 -0700
+++ b/.hgtags	Mon Oct 28 12:29:34 2013 -0700
@@ -234,3 +234,4 @@
 41541097533aa3933a018c8c1c426c1871dfd76e jdk8-b110
 af6244ba81b6b8d1bf4ab06587a2067e021e4570 jdk8-b111
 954dd199d6ff3e4cfc42b894c1f611150526eecd jdk8-b112
+54150586ba785e1eb0c0de8d13906f643f640644 jdk8-b113
--- a/make/jprt.properties	Thu Oct 24 16:52:27 2013 -0700
+++ b/make/jprt.properties	Mon Oct 28 12:29:34 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,                          \