From d98412386fc6fe19e5a02d717d6203c643349eb9 Mon Sep 17 00:00:00 2001
From: Bob Vandette <bobv@openjdk.org>
Date: Tue, 14 Feb 2017 11:25:04 -0500
Subject: [PATCH] 8174203: Enable AOT Jtreg tests on Windows x86_64

Reviewed-by: erikj, dholmes
---
 common/conf/jib-profiles.js | 14 +++++++++++---
 test/TestCommon.gmk         |  6 +++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js
index dcbb3639cd0..5ce3ed6e951 100644
--- a/common/conf/jib-profiles.js
+++ b/common/conf/jib-profiles.js
@@ -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 @@ var getJibProfilesProfiles = function (input, common, data) {
         "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 @@ var getJibProfilesProfiles = function (input, common, data) {
         "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
@@ -903,6 +903,14 @@ var getJibProfilesDependencies = function (input, common) {
         }
     };
 
+    // 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;
 };
 
diff --git a/test/TestCommon.gmk b/test/TestCommon.gmk
index 4aecf79a0fb..dfcc4de842e 100644
--- a/test/TestCommon.gmk
+++ b/test/TestCommon.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
@@ -369,6 +369,10 @@ ifeq ($(LIMIT_JTREG_VM_MEMORY), true)
 endif
 # Give tests access to JT_JAVA, see JDK-8141609
 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA}
+# Give aot tests access to Visual Studio installation
+ifneq ($(VS120COMNTOOLS), )
+  JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS=$(shell $(GETMIXEDPATH) "$(VS120COMNTOOLS)")
+endif
 # Set other vm and test options
 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)