stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189679: JDK-8189094 broke testing in Mach 5

Browse Source 
Reviewed-by: tbell, mchung
This commit is contained in:
Erik Joelsson 2017-10-19 17:47:04 +02:00
parent ca8ad3c162
commit 3263ea9b0c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
make/conf/jib-profiles.js
View File

@ -381,6 +381,11 @@ var getJibProfilesCommon = function (input, data) {
}; };
}; };
common.boot_jdk_version = "9";
common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk-"
+ common.boot_jdk_version
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
return common; return common;
}; };
@ -1008,10 +1013,6 @@ var getJibProfilesDependencies = function (input, common) {
? input.target_os + "_x64" ? input.target_os + "_x64"
: input.target_platform); : input.target_platform);
var boot_jdk_version = "9";
var boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk-"
+ boot_jdk_version
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os) var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os)
+ "-" + input.build_cpu; + "-" + input.build_cpu;
@ -1020,12 +1021,12 @@ var getJibProfilesDependencies = function (input, common) {
boot_jdk: { boot_jdk: {
server: "jpg", server: "jpg",
product: "jdk", product: "jdk",
version: boot_jdk_version, version: common.boot_jdk_version,
build_number: "181", build_number: "181",
file: "bundles/" + boot_jdk_platform + "/jdk-" + boot_jdk_version + "_" file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
+ boot_jdk_platform + "_bin.tar.gz", + boot_jdk_platform + "_bin.tar.gz",
configure_args: "--with-boot-jdk=" + boot_jdk_home, configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: boot_jdk_home + "/bin" environment_path: common.boot_jdk_home + "/bin"
}, },
devkit: { devkit: {