# HG changeset patch
# User bobv
# Date 1487089475 18000
# Node ID dde19b81b7fdef5381488fc937d40927c9102eae
# Parent  75ce8b72e3c96c90059955134d82156c13813013
8174203: Enable AOT Jtreg tests on Windows x86_64
Reviewed-by: kvn, dholmes

diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java
--- a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java	Tue Feb 14 11:24:35 2017 -0500
@@ -315,17 +315,58 @@
     }
 
     /**
+     * Visual Studio supported versions
+     * Search Order is:  VS2013, VS2015, VS2012
+     */
+    public enum VSVERSIONS {
+        VS2013("VS120COMNTOOLS", "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\amd64\\link.exe"),
+        VS2015("VS140COMNTOOLS", "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\link.exe"),
+        VS2012("VS110COMNTOOLS", "C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\bin\\amd64\\link.exe");
+
+        private final String envvariable;
+        private final String wkp;
+
+        VSVERSIONS(String envvariable, String wellknownpath) {
+            this.envvariable = envvariable;
+            this.wkp = wellknownpath;
+        }
+
+        String EnvVariable()   { return envvariable; }
+        String WellKnownPath() { return wkp; }
+    }
+
+    /**
      * Search for Visual Studio link.exe
      * Search Order is:  VS2013, VS2015, VS2012
      */
-    private String getWindowsLinkPath() {
-        String vs2013 = "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\amd64\\link.exe";
-        String vs2015 = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\link.exe";
-        String vs2012 = "C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\bin\\amd64\\link.exe";
+    private static String getWindowsLinkPath() {
+        String link = "\\VC\\bin\\amd64\\link.exe";
 
-        if (new File(vs2015).exists()) return vs2015;
-        if (new File(vs2013).exists()) return vs2013;
-        if (new File(vs2012).exists()) return vs2012;
+        /**
+         * First try searching the paths pointed to by
+         * the VS environment variables.
+         */
+        for (VSVERSIONS vs : VSVERSIONS.values()) {
+            String vspath = System.getenv(vs.EnvVariable());
+            if (vspath != null) {
+                File commonTools = new File(vspath);
+                File vsRoot = commonTools.getParentFile().getParentFile();
+                File linkPath = new File(vsRoot, link);
+                if (linkPath.exists()) return linkPath.getPath();
+            }
+        }
+
+        /**
+         * If we didn't find via the VS environment variables,
+         * try the well known paths
+         */
+        for (VSVERSIONS vs : VSVERSIONS.values()) {
+            String wkp = vs.WellKnownPath();
+            if (new File(wkp).exists()) {
+                return wkp;
+            }
+        }
+
         return null;
     }
 
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/DeoptimizationTest.java
--- a/hotspot/test/compiler/aot/DeoptimizationTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/DeoptimizationTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.DeoptimizationTest
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/RecompilationTest.java
--- a/hotspot/test/compiler/aot/RecompilationTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/RecompilationTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.RecompilationTest
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/SharedUsageTest.java
--- a/hotspot/test/compiler/aot/SharedUsageTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/SharedUsageTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.SharedUsageTest
  *        compiler.aot.AotCompiler
  * @run main compiler.aot.AotCompiler -libname libSharedUsageTest.so
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *      compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeDynamic
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeInterface
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeSpecial
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeStatic
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java
--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.calls.common.InvokeVirtual
  *        compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java
--- a/hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.DisabledAOTWithLibraryTest
  *        compiler.aot.AotCompiler
  * @run driver compiler.aot.AotCompiler -libname libDisabledAOTWithLibraryTest.so
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java
--- a/hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @run driver ClassFileInstaller ClassFileInstaller
  * @run driver compiler.aot.cli.IncorrectAOTLibraryTest
  * @summary check if incorrect aot library is handled properly
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java
--- a/hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.MultipleAOTLibraryTest
  *        compiler.aot.AotCompiler
  * @run driver compiler.aot.AotCompiler
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java
--- a/hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @run driver compiler.aot.cli.NonExistingAOTLibraryTest
  * @summary check if non-existing aot library is handled properly
  */
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java
--- a/hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib / /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.SingleAOTLibraryTest
  *        compiler.aot.AotCompiler
  * @run driver compiler.aot.AotCompiler -libname libSingleAOTLibraryTest.so
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java
--- a/hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.SingleAOTOptionTest
  *        compiler.aot.AotCompiler
  * @run driver compiler.aot.AotCompiler -libname libSingleAOTOptionTest.so
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.jaotc.ClasspathOptionTest
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  * @run driver compiler.aot.cli.jaotc.ClasspathOptionTest
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /testlibrary/ /test/lib
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @compile data/HelloWorldOne.java
  * @run driver compiler.aot.cli.jaotc.ClasspathOptionUnknownClassTest
  * @summary check jaotc can't compile class not from classpath
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.jaotc.CompileClassTest
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  * @run driver compiler.aot.cli.jaotc.CompileClassTest
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.jaotc.CompileDirectoryTest
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  *                                compiler.aot.cli.jaotc.data.HelloWorldTwo
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.jaotc.CompileJarTest
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  *                                compiler.aot.cli.jaotc.data.HelloWorldTwo
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @run driver compiler.aot.cli.jaotc.CompileModuleTest
  * @summary check jaotc can compile module
  */
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.jaotc.ListOptionNotExistingTest
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  * @run driver compiler.aot.cli.jaotc.ListOptionNotExistingTest
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.jaotc.ListOptionTest
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  * @run driver compiler.aot.cli.jaotc.ListOptionTest
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java
--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -25,7 +25,7 @@
  * @test
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.jaotc.ListOptionWrongFileTest
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  * @run driver compiler.aot.cli.jaotc.ListOptionWrongFileTest
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/fingerprint/SelfChanged.java
--- a/hotspot/test/compiler/aot/fingerprint/SelfChanged.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/fingerprint/SelfChanged.java	Tue Feb 14 11:24:35 2017 -0500
@@ -27,7 +27,7 @@
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.fingerprint.SelfChanged
  *        compiler.aot.AotCompiler
  *
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/fingerprint/SelfChangedCDS.java
--- a/hotspot/test/compiler/aot/fingerprint/SelfChangedCDS.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/fingerprint/SelfChangedCDS.java	Tue Feb 14 11:24:35 2017 -0500
@@ -27,7 +27,7 @@
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.fingerprint.SelfChanged
  *        compiler.aot.AotCompiler
  *
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/fingerprint/SuperChanged.java
--- a/hotspot/test/compiler/aot/fingerprint/SuperChanged.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/fingerprint/SuperChanged.java	Tue Feb 14 11:24:35 2017 -0500
@@ -27,7 +27,7 @@
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.fingerprint.SuperChanged
  *        compiler.aot.AotCompiler
  *
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java
--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules jdk.aot/jdk.tools.jaotc.utils
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.tools.jaotc.test.NativeOrderOutputStreamTest
  */
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java
--- a/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.verification.ClassAndLibraryNotMatchTest
  * @run driver compiler.aot.verification.ClassAndLibraryNotMatchTest
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java
--- a/hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.verification.vmflags.BasicFlagsChange
  * @run driver compiler.aot.verification.vmflags.BasicFlagsChange
diff -r 75ce8b72e3c9 -r dde19b81b7fd hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java
--- a/hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java	Thu Feb 09 16:03:03 2017 -0500
+++ b/hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java	Tue Feb 14 11:24:35 2017 -0500
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /test/lib /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64") & !(os.family == "windows")
+ * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.verification.vmflags.BasicFlagsChange
  * @run driver compiler.aot.verification.vmflags.BasicFlagsChange