Merge

Sat, 02 Jun 2012 07:32:21 -0400

author
dholmes
date
Sat, 02 Jun 2012 07:32:21 -0400
changeset 3820
4434fdad6b37
parent 3818
6e2633440960
parent 3819
fab99b17c1de
child 3821
e17b61ba7bb3

Merge

make/jprt.properties file | annotate | diff | comparison | revisions
     1.1 --- a/make/jprt.properties	Fri Jun 01 15:30:44 2012 -0700
     1.2 +++ b/make/jprt.properties	Sat Jun 02 07:32:21 2012 -0400
     1.3 @@ -346,12 +346,12 @@
     1.4      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
     1.5      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \
     1.6      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \
     1.7 -    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC
     1.8 -#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
     1.9 -#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_tiered, \
    1.10 -#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
    1.11 -#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
    1.12 -#    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
    1.13 +    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
    1.14 +    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
    1.15 +    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
    1.16 +    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
    1.17 +    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
    1.18 +    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
    1.19  
    1.20  jprt.my.windows.i586.test.targets = \
    1.21      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
    1.22 @@ -510,3 +510,6 @@
    1.23  jprt.make.rule.test.targets.jdk7u4=${jprt.make.rule.test.targets.jdk7}
    1.24  jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
    1.25  
    1.26 +# 7155453: Work-around to prevent popups on OSX from blocking test completion
    1.27 +# but the work-around is added to all platforms to be consistent 
    1.28 +jprt.jbb.options=-Djava.awt.headless=true

mercurial