172 ${my.build.targets.${jprt.test.set}} : ${my.build.targets.default}} |
172 ${my.build.targets.${jprt.test.set}} : ${my.build.targets.default}} |
173 |
173 |
174 # Select test targets - jprt default for jprt.test.set is "default" |
174 # Select test targets - jprt default for jprt.test.set is "default" |
175 jprt.test.targets=${my.test.targets.${jprt.test.set}} |
175 jprt.test.targets=${my.test.targets.${jprt.test.set}} |
176 jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}} |
176 jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}} |
177 jprt.test.bundle.targets=${my.jprt.test.bundle.targets.${jprt.test.set}} |
177 |
|
178 # Not all test targets need the test image |
|
179 jprt.test.bundle.targets=\ |
|
180 ${my.make.rule.test.targets.hotspot.reg}, \ |
|
181 ${my.make.rule.test.targets.hotspot.gtest} \ |
|
182 ${my.make.rule.test.targets.nativesanity} \ |
|
183 ${my.test.target.set:TESTNAME=jdk_lang} |
178 |
184 |
179 # 7155453: Work-around to prevent popups on OSX from blocking test completion |
185 # 7155453: Work-around to prevent popups on OSX from blocking test completion |
180 # but the work-around is added to all platforms to be consistent |
186 # but the work-around is added to all platforms to be consistent |
181 jprt.jbb.options=-Djava.awt.headless=true |
187 jprt.jbb.options=-Djava.awt.headless=true |
182 |
188 |
471 # All the makefile based tests to run |
477 # All the makefile based tests to run |
472 my.make.rule.test.targets.hotspot= \ |
478 my.make.rule.test.targets.hotspot= \ |
473 ${my.make.rule.test.targets.hotspot.reg} \ |
479 ${my.make.rule.test.targets.hotspot.reg} \ |
474 ${my.make.rule.test.targets.hotspot.other} |
480 ${my.make.rule.test.targets.hotspot.other} |
475 |
481 |
476 # Install the test bundle for the testset hotspot jtreg tests |
|
477 # (but not for the other Makefile based tests) |
|
478 my.jprt.test.bundle.targets.hotspot= \ |
|
479 ${my.make.rule.test.targets.hotspot.reg}, \ |
|
480 ${my.make.rule.test.targets.hotspot.gtest} |
|
481 |
|
482 # Native jdk and hotspot test targets (testset=nativesanity) |
482 # Native jdk and hotspot test targets (testset=nativesanity) |
483 my.make.rule.test.targets.nativesanity= \ |
483 my.make.rule.test.targets.nativesanity= \ |
484 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
484 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
485 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |
485 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |
486 |
|
487 # Install the test bundle for the nativesanity jtreg tests |
|
488 my.jprt.test.bundle.targets.nativesanity=${my.make.rule.test.targets.nativesanity} |
|
489 |
486 |
490 ################################################################################ |
487 ################################################################################ |
491 # Testset buildinfra |
488 # Testset buildinfra |
492 my.build.flavors.buildinfra = \ |
489 my.build.flavors.buildinfra = \ |
493 product,fastdebug,slowdebug,productZero,fastdebugZero \ |
490 product,fastdebug,slowdebug,productZero,fastdebugZero \ |