changeset 13541:3d6349716cc0

8186537: remove unnecessary @requires from hotspot/compiler/aot tests Reviewed-by: kvn
author iignatyev
date Mon, 21 Aug 2017 17:08:54 -0700
parents 8959e2938bff
children eed8aa5e12df
files test/compiler/aot/DeoptimizationTest.java test/compiler/aot/RecompilationTest.java test/compiler/aot/SharedUsageTest.java test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java test/compiler/aot/cli/DisabledAOTWithLibraryTest.java test/compiler/aot/cli/IncorrectAOTLibraryTest.java test/compiler/aot/cli/MultipleAOTLibraryTest.java test/compiler/aot/cli/NonExistingAOTLibraryTest.java test/compiler/aot/cli/SingleAOTLibraryTest.java test/compiler/aot/cli/SingleAOTOptionTest.java test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java test/compiler/aot/cli/jaotc/CompileClassTest.java test/compiler/aot/cli/jaotc/CompileDirectoryTest.java test/compiler/aot/cli/jaotc/CompileJarTest.java test/compiler/aot/cli/jaotc/CompileModuleTest.java test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java test/compiler/aot/cli/jaotc/ListOptionTest.java test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java test/compiler/aot/verification/vmflags/TrackedFlagTest.java
diffstat 54 files changed, 0 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/test/compiler/aot/DeoptimizationTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/DeoptimizationTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.DeoptimizationTest
  *        compiler.aot.AotCompiler
--- a/test/compiler/aot/RecompilationTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/RecompilationTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc
  * @build compiler.aot.RecompilationTest
  *        compiler.aot.AotCompiler
--- a/test/compiler/aot/SharedUsageTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/SharedUsageTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /testlibrary /
- * @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
--- a/test/compiler/aot/cli/IncorrectAOTLibraryTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/IncorrectAOTLibraryTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/MultipleAOTLibraryTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/MultipleAOTLibraryTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.MultipleAOTLibraryTest
  *        compiler.aot.AotCompiler
  * @run driver compiler.aot.AotCompiler
--- a/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @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
  */
--- a/test/compiler/aot/cli/SingleAOTLibraryTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/SingleAOTLibraryTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib / /testlibrary
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/SingleAOTOptionTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/SingleAOTOptionTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /testlibrary/ /test/lib
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/jaotc/CompileClassTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/CompileClassTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/jaotc/CompileJarTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/CompileJarTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/jaotc/CompileModuleTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/CompileModuleTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @run driver compiler.aot.cli.jaotc.CompileModuleTest
  * @summary check jaotc can compile module
  */
--- a/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/jaotc/ListOptionTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/ListOptionTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -26,7 +26,6 @@
  * @requires vm.aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
- * @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
--- a/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -24,7 +24,6 @@
 /**
  * @test
  * @requires vm.aot
- * @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
  */
--- a/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /
- * @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
--- a/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /
- * @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
--- a/test/compiler/aot/verification/vmflags/TrackedFlagTest.java	Mon Aug 21 18:14:59 2017 +0200
+++ b/test/compiler/aot/verification/vmflags/TrackedFlagTest.java	Mon Aug 21 17:08:54 2017 -0700
@@ -25,7 +25,6 @@
  * @test
  * @requires vm.aot
  * @library /test/lib /
- * @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