infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-21 15:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

8173476: Provide lldb from devkit when running tests on macosx

Browse Source 
Reviewed-by: ihse, tbell
This commit is contained in:
Erik Joelsson 2017-01-27 16:50:39 +01:00
parent e1d8c67bff
commit b279fd00db
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/conf/jib-profiles.js
View File

@ -610,6 +610,19 @@ var getJibProfilesProfiles = function (input, common, data) {
}
profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);
// On macosx add the devkit bin dir to the path in all the run-test profiles.
// This gives us a guaranteed working version of lldb for the jtreg failure handler.
if (input.build_os == "macosx") {
macosxRunTestExtra = {
dependencies: [ "devkit" ],
environment_path: input.get("devkit", "install_path")
+ "/Xcode.app/Contents/Developer/usr/bin"
}
profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra);
profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra);
profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra);
}
//
// Define artifacts for profiles
//
@ -844,7 +857,7 @@ var getJibProfilesDependencies = function (input, common) {
file: boot_jdk_platform + "/jdk-" + common.boot_jdk_revision
+ "-" + boot_jdk_platform + ".tar.gz",
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home
environment_path: common.boot_jdk_home + "/bin"
},
devkit: {