436 solaris_sparcv9_5.11-*-default-hotspot_basicvmtest, \ |
436 solaris_sparcv9_5.11-*-default-hotspot_basicvmtest, \ |
437 solaris_x64_5.11-*-default-hotspot_basicvmtest, \ |
437 solaris_x64_5.11-*-default-hotspot_basicvmtest, \ |
438 windows_i586_6.3-*-default-hotspot_basicvmtest, \ |
438 windows_i586_6.3-*-default-hotspot_basicvmtest, \ |
439 windows_x64_6.3-*-default-hotspot_basicvmtest |
439 windows_x64_6.3-*-default-hotspot_basicvmtest |
440 |
440 |
|
441 my.make.rule.test.targets.hotspot.gtest= \ |
|
442 linux_i586_3.8-*-default-hotspot_gtest, \ |
|
443 linux_x64_3.8-*-default-hotspot_gtest, \ |
|
444 macosx_x64_10.9-*-default-hotspot_gtest, \ |
|
445 solaris_sparcv9_5.11-*-default-hotspot_gtest, \ |
|
446 solaris_x64_5.11-*-default-hotspot_gtest, \ |
|
447 windows_i586_6.3-*-default-hotspot_gtest, \ |
|
448 windows_x64_6.3-*-default-hotspot_gtest, \ |
|
449 ${my.additional.make.rule.test.targets.hotspot.gtest} |
|
450 |
441 my.make.rule.test.targets.hotspot.reg.group= \ |
451 my.make.rule.test.targets.hotspot.reg.group= \ |
442 solaris_sparcv9_5.11-fastdebug-c2-GROUP, \ |
452 solaris_sparcv9_5.11-fastdebug-c2-GROUP, \ |
443 solaris_x64_5.11-fastdebug-c2-GROUP, \ |
453 solaris_x64_5.11-fastdebug-c2-GROUP, \ |
444 linux_i586_3.8-fastdebug-c2-GROUP, \ |
454 linux_i586_3.8-fastdebug-c2-GROUP, \ |
445 linux_x64_3.8-fastdebug-c2-GROUP, \ |
455 linux_x64_3.8-fastdebug-c2-GROUP, \ |
463 ${my.additional.make.rule.test.targets.hotspot.reg} |
473 ${my.additional.make.rule.test.targets.hotspot.reg} |
464 |
474 |
465 # Other Makefile based Hotspot tests |
475 # Other Makefile based Hotspot tests |
466 my.make.rule.test.targets.hotspot.other= \ |
476 my.make.rule.test.targets.hotspot.other= \ |
467 ${my.make.rule.test.targets.hotspot.basicvmtests}, \ |
477 ${my.make.rule.test.targets.hotspot.basicvmtests}, \ |
|
478 ${my.make.rule.test.targets.hotspot.gtest}, \ |
468 ${my.additional.make.rule.test.targets.hotspot.other} |
479 ${my.additional.make.rule.test.targets.hotspot.other} |
469 |
480 |
470 # All the makefile based tests to run |
481 # All the makefile based tests to run |
471 my.make.rule.test.targets.hotspot= \ |
482 my.make.rule.test.targets.hotspot= \ |
472 ${my.make.rule.test.targets.hotspot.reg} \ |
483 ${my.make.rule.test.targets.hotspot.reg} \ |
473 ${my.make.rule.test.targets.hotspot.other} |
484 ${my.make.rule.test.targets.hotspot.other} |
474 |
485 |
475 # Install the test bundle for the testset hotspot jtreg tests |
486 # Install the test bundle for the testset hotspot jtreg tests |
476 # (but not for the other Makefile based tests) |
487 # (but not for the other Makefile based tests) |
477 my.jprt.test.bundle.targets.hotspot=${my.make.rule.test.targets.hotspot.reg} |
488 my.jprt.test.bundle.targets.hotspot= \ |
|
489 ${my.make.rule.test.targets.hotspot.reg}, \ |
|
490 ${my.make.rule.test.targets.hotspot.gtest} |
478 |
491 |
479 # Native jdk and hotspot test targets (testset=nativesanity) |
492 # Native jdk and hotspot test targets (testset=nativesanity) |
480 my.make.rule.test.targets.nativesanity= \ |
493 my.make.rule.test.targets.nativesanity= \ |
481 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
494 ${my.test.target.set:TESTNAME=jdk_native_sanity}, \ |
482 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |
495 ${my.test.target.set:TESTNAME=hotspot_native_sanity} |