common/conf/jib-profiles.js
changeset 46193 7d73b0bb32b1
parent 43602 aa491a7d76c1
parent 46192 14c55d15c9d7
child 46196 822ca950ddaa
--- a/common/conf/jib-profiles.js	Wed Jul 05 22:55:08 2017 +0200
+++ b/common/conf/jib-profiles.js	Fri Feb 24 12:31:56 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -555,7 +555,7 @@
         "run-test-jprt": {
             target_os: input.build_os,
             target_cpu: input.build_cpu,
-            dependencies: [ "jtreg", "gnumake", "boot_jdk" ],
+            dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit" ],
             labels: "test",
             environment: {
                 "JT_JAVA": common.boot_jdk_home
@@ -565,7 +565,7 @@
         "run-test": {
             target_os: input.build_os,
             target_cpu: input.build_cpu,
-            dependencies: [ "jtreg", "gnumake", "boot_jdk" ],
+            dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit" ],
             labels: "test",
             environment: {
                 "JT_JAVA": common.boot_jdk_home
@@ -916,6 +916,14 @@
         }
     };
 
+    // 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;
 };