434 |
434 |
435 "macosx-x64": { |
435 "macosx-x64": { |
436 target_os: "macosx", |
436 target_os: "macosx", |
437 target_cpu: "x64", |
437 target_cpu: "x64", |
438 dependencies: ["devkit"], |
438 dependencies: ["devkit"], |
439 configure_args: concat(common.configure_args_64bit, "--with-zlib=system"), |
439 configure_args: concat(common.configure_args_64bit, "--with-zlib=system", |
|
440 "--with-macosx-version-max=10.7.0"), |
440 }, |
441 }, |
441 |
442 |
442 "solaris-x64": { |
443 "solaris-x64": { |
443 target_os: "solaris", |
444 target_os: "solaris", |
444 target_cpu: "x64", |
445 target_cpu: "x64", |
613 if (testedProfile == null) { |
614 if (testedProfile == null) { |
614 testedProfile = input.build_os + "-" + input.build_cpu; |
615 testedProfile = input.build_os + "-" + input.build_cpu; |
615 } |
616 } |
616 var testOnlyProfilesPrebuilt = { |
617 var testOnlyProfilesPrebuilt = { |
617 "run-test-prebuilt": { |
618 "run-test-prebuilt": { |
|
619 target_os: input.build_os, |
|
620 target_cpu: input.build_cpu, |
618 src: "src.conf", |
621 src: "src.conf", |
619 dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk", |
622 dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk", |
620 testedProfile + ".test", "src.full" |
623 testedProfile + ".test", "src.full" |
621 ], |
624 ], |
622 work_dir: input.get("src.full", "install_path") + "/test", |
625 work_dir: input.get("src.full", "install_path") + "/test", |
633 // variable is valid and if so, add the appropriate target_* values from |
636 // variable is valid and if so, add the appropriate target_* values from |
634 // the tested profile. |
637 // the tested profile. |
635 if (input.profile == "run-test-prebuilt") { |
638 if (input.profile == "run-test-prebuilt") { |
636 if (profiles[testedProfile] == null) { |
639 if (profiles[testedProfile] == null) { |
637 error("testedProfile is not defined: " + testedProfile); |
640 error("testedProfile is not defined: " + testedProfile); |
638 } else { |
641 } |
639 testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"] |
642 } |
640 = profiles[testedProfile]["target_os"]; |
643 if (profiles[testedProfile] != null) { |
641 testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"] |
644 testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"] |
642 = profiles[testedProfile]["target_cpu"]; |
645 = profiles[testedProfile]["target_os"]; |
643 } |
646 testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"] |
|
647 = profiles[testedProfile]["target_cpu"]; |
644 } |
648 } |
645 profiles = concatObjects(profiles, testOnlyProfilesPrebuilt); |
649 profiles = concatObjects(profiles, testOnlyProfilesPrebuilt); |
646 |
650 |
647 // On macosx add the devkit bin dir to the path in all the run-test profiles. |
651 // On macosx add the devkit bin dir to the path in all the run-test profiles. |
648 // This gives us a guaranteed working version of lldb for the jtreg failure handler. |
652 // This gives us a guaranteed working version of lldb for the jtreg failure handler. |