26 ############## |
26 ############## |
27 # |
27 # |
28 # Global settings |
28 # Global settings |
29 # |
29 # |
30 |
30 |
31 # Regression tests depend on test bundle |
31 # Install test bundle for targets in jprt.test.bundle.targets set |
32 jprt.use.reg.test.bundle=true |
32 jprt.selective.test.bundle.installation=true |
33 |
33 |
34 # The current release name |
34 # The current release name |
35 jprt.tools.default.release=jdk9 |
35 jprt.tools.default.release=jdk9 |
36 |
36 |
37 # Check if this is the equivalent of a hotspot push job |
37 # Check if this is the equivalent of a hotspot push job |
71 jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}} |
71 jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}} |
72 |
72 |
73 # Select test targets - jprt default for jprt.test.set is "default" |
73 # Select test targets - jprt default for jprt.test.set is "default" |
74 jprt.test.targets=${my.test.targets.${jprt.test.set}} |
74 jprt.test.targets=${my.test.targets.${jprt.test.set}} |
75 jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}} |
75 jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}} |
|
76 jprt.test.bundle.targets=${my.jprt.test.bundle.targets.${jprt.test.set}} |
76 |
77 |
77 # 7155453: Work-around to prevent popups on OSX from blocking test completion |
78 # 7155453: Work-around to prevent popups on OSX from blocking test completion |
78 # but the work-around is added to all platforms to be consistent |
79 # but the work-around is added to all platforms to be consistent |
79 jprt.jbb.options=-Djava.awt.headless=true |
80 jprt.jbb.options=-Djava.awt.headless=true |
80 |
81 |
440 windows_i586_6.1-fastdebug-c2-GROUP, \ |
441 windows_i586_6.1-fastdebug-c2-GROUP, \ |
441 windows_x64_6.1-fastdebug-c2-GROUP, \ |
442 windows_x64_6.1-fastdebug-c2-GROUP, \ |
442 linux_i586_2.6-fastdebug-c1-GROUP, \ |
443 linux_i586_2.6-fastdebug-c1-GROUP, \ |
443 windows_i586_6.1-fastdebug-c1-GROUP |
444 windows_i586_6.1-fastdebug-c1-GROUP |
444 |
445 |
445 my.make.rule.test.targets.hotspot= \ |
446 # Hotspot jtreg tests |
446 ${my.make.rule.test.targets.hotspot.clienttests}, \ |
447 my.make.rule.test.targets.hotspot.reg= \ |
447 ${my.make.rule.test.targets.hotspot.servertests}, \ |
|
448 ${my.make.rule.test.targets.hotspot.internalvmtests}, \ |
|
449 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \ |
448 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \ |
450 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1}, \ |
449 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1}, \ |
451 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2}, \ |
450 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2}, \ |
452 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3}, \ |
451 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3}, \ |
453 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed}, \ |
452 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed}, \ |
456 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_gcold}, \ |
455 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_gcold}, \ |
457 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ |
456 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ |
458 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed}, \ |
457 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed}, \ |
459 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ |
458 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ |
460 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \ |
459 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \ |
461 ${my.additional.make.rule.test.targets.hotspot} |
460 ${my.additional.make.rule.test.targets.hotspot.reg} |
|
461 |
|
462 # Other Makefile based Hotspot tests |
|
463 my.make.rule.test.targets.hotspot.other= \ |
|
464 ${my.make.rule.test.targets.hotspot.clienttests}, \ |
|
465 ${my.make.rule.test.targets.hotspot.servertests}, \ |
|
466 ${my.make.rule.test.targets.hotspot.internalvmtests}, \ |
|
467 ${my.additional.make.rule.test.targets.hotspot.other} |
|
468 |
|
469 # All the makefile based tests to run |
|
470 my.make.rule.test.targets.hotspot= \ |
|
471 ${my.make.rule.test.targets.hotspot.reg} \ |
|
472 ${my.make.rule.test.targets.hotspot.other} |
|
473 |
|
474 # Install the test bundle for the testset hotspot jtreg tests |
|
475 # (but not for the other Makefile based tests) |
|
476 my.jprt.test.bundle.targets.hotspot=${my.make.rule.test.targets.hotspot.reg} |
462 |
477 |
463 # Native jdk and hotspot test targets (testset=nativesanity) |
478 # Native jdk and hotspot test targets (testset=nativesanity) |
464 my.make.rule.test.targets.nativesanity= \ |
479 my.make.rule.test.targets.nativesanity= \ |
465 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
480 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
466 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |
481 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |
|
482 |
|
483 # Install the test bundle for the nativesanity jtreg tests |
|
484 my.jprt.test.bundle.targets.nativesanity=${my.make.rule.test.targets.nativesanity} |