Mercurial > hg > truffle
comparison make/jprt.properties @ 6117:4434fdad6b37
Merge
author | dholmes |
---|---|
date | Sat, 02 Jun 2012 07:32:21 -0400 |
parents | 48df98e03639 fab99b17c1de |
children | 829ee34e7cbd |
comparison
equal
deleted
inserted
replaced
6115:6e2633440960 | 6117:4434fdad6b37 |
---|---|
344 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \ | 344 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \ |
345 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \ | 345 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \ |
346 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ | 346 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ |
347 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \ | 347 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \ |
348 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \ | 348 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \ |
349 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC | 349 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \ |
350 # ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \ | 350 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \ |
351 # ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_tiered, \ | 351 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \ |
352 # ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ | 352 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ |
353 # ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \ | 353 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \ |
354 # ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC | 354 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC |
355 | 355 |
356 jprt.my.windows.i586.test.targets = \ | 356 jprt.my.windows.i586.test.targets = \ |
357 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | 357 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ |
358 ${jprt.my.windows.i586}-{product|fastdebug}-c2-jvm98_nontiered, \ | 358 ${jprt.my.windows.i586}-{product|fastdebug}-c2-jvm98_nontiered, \ |
359 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | 359 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-scimark, \ |
508 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard} | 508 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard} |
509 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} | 509 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} |
510 jprt.make.rule.test.targets.jdk7u4=${jprt.make.rule.test.targets.jdk7} | 510 jprt.make.rule.test.targets.jdk7u4=${jprt.make.rule.test.targets.jdk7} |
511 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} | 511 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} |
512 | 512 |
513 # 7155453: Work-around to prevent popups on OSX from blocking test completion | |
514 # but the work-around is added to all platforms to be consistent | |
515 jprt.jbb.options=-Djava.awt.headless=true |