Merge jdk8-b113

Wed, 23 Oct 2013 08:50:36 -0700

author
katleman
date
Wed, 23 Oct 2013 08:50:36 -0700
changeset 2142
54150586ba78
parent 2140
bca97b47f0a2
parent 2141
127c2e74d2cf
child 2143
850d2602ae98

Merge

     1.1 --- a/make/jprt.properties	Thu Oct 17 16:13:39 2013 -0700
     1.2 +++ b/make/jprt.properties	Wed Oct 23 08:50:36 2013 -0700
     1.3 @@ -33,9 +33,7 @@
     1.4  
     1.5  # Standard list of jprt build targets for this source tree
     1.6  jprt.build.targets=                                             \
     1.7 -    solaris_sparc_5.10-{product|fastdebug},                     \
     1.8      solaris_sparcv9_5.10-{product|fastdebug},                   \
     1.9 -    solaris_i586_5.10-{product|fastdebug},                      \
    1.10      solaris_x64_5.10-{product|fastdebug},                       \
    1.11      linux_i586_2.6-{product|fastdebug},                         \
    1.12      linux_x64_2.6-{product|fastdebug},                          \
    1.13 @@ -45,9 +43,7 @@
    1.14  
    1.15  # Test target list (no fastdebug & limited c2 testing)
    1.16  jprt.my.test.target.set= 					\
    1.17 -    solaris_sparc_5.10-product-c1-TESTNAME,                     \
    1.18      solaris_sparcv9_5.10-product-c2-TESTNAME,                   \
    1.19 -    solaris_i586_5.10-product-c1-TESTNAME,                      \
    1.20      solaris_x64_5.10-product-c2-TESTNAME,                       \
    1.21      linux_i586_2.6-product-{c1|c2}-TESTNAME,                    \
    1.22      linux_x64_2.6-product-c2-TESTNAME,                          \
    1.23 @@ -64,9 +60,7 @@
    1.24  
    1.25  # Test target list (no fastdebug & limited c2 testing)
    1.26  jprt.my.test.target.set= 					\
    1.27 -    solaris_sparc_5.10-product-c1-TESTNAME,                     \
    1.28      solaris_sparcv9_5.10-product-c2-TESTNAME,                   \
    1.29 -    solaris_i586_5.10-product-c1-TESTNAME,                      \
    1.30      solaris_x64_5.10-product-c2-TESTNAME,                       \
    1.31      linux_i586_2.6-product-{c1|c2}-TESTNAME,                    \
    1.32      linux_x64_2.6-product-c2-TESTNAME,                          \

mercurial