45 # Directories to be excluded from the source bundles |
45 # Directories to be excluded from the source bundles |
46 jprt.bundle.exclude.src.dirs=build dist webrev |
46 jprt.bundle.exclude.src.dirs=build dist webrev |
47 |
47 |
48 # Use configure when building |
48 # Use configure when building |
49 jprt.build.use.configure=true |
49 jprt.build.use.configure=true |
|
50 |
|
51 # Set up the run flavors (jvm variants) |
|
52 jprt.run.flavors=c1,c2,default,${my.additional.run.flavors} |
50 |
53 |
51 # Set make target to use for different build flavors |
54 # Set make target to use for different build flavors |
52 jprt.build.flavor.debugOpen.target=jprt_bundle |
55 jprt.build.flavor.debugOpen.target=jprt_bundle |
53 jprt.build.flavor.fastdebug.target=jprt_bundle |
56 jprt.build.flavor.fastdebug.target=jprt_bundle |
54 jprt.build.flavor.product.target=jprt_bundle |
57 jprt.build.flavor.product.target=jprt_bundle |
71 jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}} |
74 jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}} |
72 |
75 |
73 # Select test targets - jprt default for jprt.test.set is "default" |
76 # Select test targets - jprt default for jprt.test.set is "default" |
74 jprt.test.targets=${my.test.targets.${jprt.test.set}} |
77 jprt.test.targets=${my.test.targets.${jprt.test.set}} |
75 jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}} |
78 jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}} |
|
79 jprt.test.bundle.targets=${my.jprt.test.bundle.targets.${jprt.test.set}} |
76 |
80 |
77 # 7155453: Work-around to prevent popups on OSX from blocking test completion |
81 # 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 |
82 # but the work-around is added to all platforms to be consistent |
79 jprt.jbb.options=-Djava.awt.headless=true |
83 jprt.jbb.options=-Djava.awt.headless=true |
80 |
84 |
413 ${my.additional.test.targets.hotspot} |
417 ${my.additional.test.targets.hotspot} |
414 |
418 |
415 |
419 |
416 # Make file based test targets |
420 # Make file based test targets |
417 |
421 |
418 my.make.rule.test.targets.hotspot.clienttests= \ |
422 my.make.rule.test.targets.hotspot.basicvmtests= \ |
419 linux_i586_2.6-*-c1-hotspot_clienttest, \ |
423 linux_i586_2.6-*-default-hotspot_basicvmtest, \ |
420 windows_i586_6.2-*-c1-hotspot_clienttest |
424 linux_x64_2.6-*-default-hotspot_basicvmtest, \ |
421 |
425 macosx_x64_10.9-*-default-hotspot_basicvmtest, \ |
422 my.make.rule.test.targets.hotspot.servertests= \ |
426 solaris_sparcv9_5.11-*-default-hotspot_basicvmtest, \ |
423 solaris_sparcv9_5.11-*-c2-hotspot_servertest, \ |
427 solaris_x64_5.11-*-default-hotspot_basicvmtest, \ |
424 solaris_x64_5.11-*-c2-hotspot_servertest, \ |
428 windows_i586_6.2-*-default-hotspot_basicvmtest, \ |
425 linux_i586_2.6-*-c2-hotspot_servertest, \ |
429 windows_x64_6.2-*-default-hotspot_basicvmtest |
426 linux_x64_2.6-*-c2-hotspot_servertest, \ |
430 |
427 macosx_x64_10.9-*-c2-hotspot_servertest, \ |
|
428 windows_i586_6.2-*-c2-hotspot_servertest, \ |
|
429 windows_x64_6.2-*-c2-hotspot_servertest |
|
430 |
|
431 my.make.rule.test.targets.hotspot.internalvmtests= \ |
431 my.make.rule.test.targets.hotspot.internalvmtests= \ |
432 solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \ |
432 solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \ |
433 solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \ |
433 solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \ |
434 linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \ |
434 linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \ |
435 linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \ |
435 linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \ |
446 windows_i586_6.2-fastdebug-c2-GROUP, \ |
446 windows_i586_6.2-fastdebug-c2-GROUP, \ |
447 windows_x64_6.2-fastdebug-c2-GROUP, \ |
447 windows_x64_6.2-fastdebug-c2-GROUP, \ |
448 linux_i586_2.6-fastdebug-c1-GROUP, \ |
448 linux_i586_2.6-fastdebug-c1-GROUP, \ |
449 windows_i586_6.2-fastdebug-c1-GROUP |
449 windows_i586_6.2-fastdebug-c1-GROUP |
450 |
450 |
451 my.make.rule.test.targets.hotspot= \ |
451 # Hotspot jtreg tests |
452 ${my.make.rule.test.targets.hotspot.clienttests}, \ |
452 my.make.rule.test.targets.hotspot.reg= \ |
453 ${my.make.rule.test.targets.hotspot.servertests}, \ |
|
454 ${my.make.rule.test.targets.hotspot.internalvmtests}, \ |
|
455 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \ |
453 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \ |
456 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1}, \ |
454 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1}, \ |
457 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2}, \ |
455 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2}, \ |
458 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3}, \ |
456 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3}, \ |
459 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed}, \ |
457 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed}, \ |
460 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ |
458 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ |
461 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_closed}, \ |
459 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_closed}, \ |
462 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_gcold}, \ |
460 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_gcold}, \ |
463 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ |
461 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ |
464 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed}, \ |
|
465 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ |
462 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ |
466 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \ |
463 ${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \ |
467 ${my.additional.make.rule.test.targets.hotspot} |
464 ${my.additional.make.rule.test.targets.hotspot.reg} |
|
465 |
|
466 # Other Makefile based Hotspot tests |
|
467 my.make.rule.test.targets.hotspot.other= \ |
|
468 ${my.make.rule.test.targets.hotspot.basicvmtests}, \ |
|
469 ${my.make.rule.test.targets.hotspot.internalvmtests}, \ |
|
470 ${my.additional.make.rule.test.targets.hotspot.other} |
|
471 |
|
472 # All the makefile based tests to run |
|
473 my.make.rule.test.targets.hotspot= \ |
|
474 ${my.make.rule.test.targets.hotspot.reg} \ |
|
475 ${my.make.rule.test.targets.hotspot.other} |
|
476 |
|
477 # Install the test bundle for the testset hotspot jtreg tests |
|
478 # (but not for the other Makefile based tests) |
|
479 my.jprt.test.bundle.targets.hotspot=${my.make.rule.test.targets.hotspot.reg} |
468 |
480 |
469 # Native jdk and hotspot test targets (testset=nativesanity) |
481 # Native jdk and hotspot test targets (testset=nativesanity) |
470 my.make.rule.test.targets.nativesanity= \ |
482 my.make.rule.test.targets.nativesanity= \ |
471 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
483 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
472 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |
484 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |
|
485 |
|
486 # Install the test bundle for the nativesanity jtreg tests |
|
487 my.jprt.test.bundle.targets.nativesanity=${my.make.rule.test.targets.nativesanity} |