--- a/make/conf/jib-profiles.js Fri Nov 02 12:33:28 2018 -0700
+++ b/make/conf/jib-profiles.js Fri Nov 02 14:00:29 2018 -0700
@@ -709,7 +709,8 @@
"run-test-prebuilt": {
target_os: input.build_os,
target_cpu: input.build_cpu,
- dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk",
+ dependencies: [
+ "jtreg", "gnumake", "boot_jdk", "devkit", "jib", testedProfile + ".jdk",
testedProfile + ".test"
],
src: "src.conf",
@@ -743,7 +744,6 @@
// 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"
};
@@ -836,7 +836,10 @@
organization: common.organization,
ext: "tar.gz",
module: "devkit-" + devkit_platform,
- revision: devkit_platform_revisions[devkit_platform]
+ revision: devkit_platform_revisions[devkit_platform],
+ environment: {
+ "DEVKIT_HOME": input.get("devkit", "home_path"),
+ }
},
build_devkit: {
@@ -937,14 +940,6 @@
},
};
- // Need to add a value for the Visual Studio tools variable to make
- // jaot be able to pick up the Visual Studio linker in testing.
- if (input.target_os == "windows") {
- dependencies.devkit.environment = {
- VS120COMNTOOLS: input.get("devkit", "install_path") + "/Common7/Tools"
- };
- }
-
return dependencies;
};