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

8174203: Enable AOT Jtreg tests on Windows x86_64

Browse Source 
Reviewed-by: kvn, dholmes
This commit is contained in:
Bob Vandette 2017-02-14 11:24:35 -05:00
parent f0e05db651
commit b6eb59739d
59 changed files with 106 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java
View File

@ -314,18 +314,59 @@ public class Main implements LogPrinter {
}
}
/**
* 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";
/**
* 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;
}
}
if (new File(vs2015).exists()) return vs2015;
if (new File(vs2013).exists()) return vs2013;
if (new File(vs2012).exists()) return vs2012;
return null;
}

2
hotspot/test/compiler/aot/DeoptimizationTest.java
View File

@ -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

2
hotspot/test/compiler/aot/RecompilationTest.java
View File

@ -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

2
hotspot/test/compiler/aot/SharedUsageTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java
View File

@ -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
*/

2
hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java
View File

@ -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
*/

2
hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java
View File

@ -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

2
hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java
View File

@ -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

2
hotspot/test/compiler/aot/fingerprint/SelfChanged.java
View File

@ -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
*

2
hotspot/test/compiler/aot/fingerprint/SelfChangedCDS.java
View File

@ -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
*

2
hotspot/test/compiler/aot/fingerprint/SuperChanged.java
View File

@ -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
*

2
hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java
View File

@ -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
*/

2
hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java
View File

@ -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

2
hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java
View File

@ -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

2
hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java
View File

@ -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