equal
deleted
inserted
replaced
608 = profiles[testedProfile]["target_cpu"]; |
608 = profiles[testedProfile]["target_cpu"]; |
609 } |
609 } |
610 } |
610 } |
611 profiles = concatObjects(profiles, testOnlyProfilesPrebuilt); |
611 profiles = concatObjects(profiles, testOnlyProfilesPrebuilt); |
612 |
612 |
|
613 // On macosx add the devkit bin dir to the path in all the run-test profiles. |
|
614 // This gives us a guaranteed working version of lldb for the jtreg failure handler. |
|
615 if (input.build_os == "macosx") { |
|
616 macosxRunTestExtra = { |
|
617 dependencies: [ "devkit" ], |
|
618 environment_path: input.get("devkit", "install_path") |
|
619 + "/Xcode.app/Contents/Developer/usr/bin" |
|
620 } |
|
621 profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra); |
|
622 profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra); |
|
623 profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra); |
|
624 } |
|
625 |
613 // |
626 // |
614 // Define artifacts for profiles |
627 // Define artifacts for profiles |
615 // |
628 // |
616 // Macosx bundles are named osx and Windows demo bundles use zip instead of |
629 // Macosx bundles are named osx and Windows demo bundles use zip instead of |
617 // tar.gz. |
630 // tar.gz. |
842 revision: common.boot_jdk_revision, |
855 revision: common.boot_jdk_revision, |
843 checksum_file: boot_jdk_platform + "/MD5_VALUES", |
856 checksum_file: boot_jdk_platform + "/MD5_VALUES", |
844 file: boot_jdk_platform + "/jdk-" + common.boot_jdk_revision |
857 file: boot_jdk_platform + "/jdk-" + common.boot_jdk_revision |
845 + "-" + boot_jdk_platform + ".tar.gz", |
858 + "-" + boot_jdk_platform + ".tar.gz", |
846 configure_args: "--with-boot-jdk=" + common.boot_jdk_home, |
859 configure_args: "--with-boot-jdk=" + common.boot_jdk_home, |
847 environment_path: common.boot_jdk_home |
860 environment_path: common.boot_jdk_home + "/bin" |
848 }, |
861 }, |
849 |
862 |
850 devkit: { |
863 devkit: { |
851 organization: common.organization, |
864 organization: common.organization, |
852 ext: "tar.gz", |
865 ext: "tar.gz", |