# HG changeset patch # User iignatyev # Date 1503348963 25200 # Mon Aug 21 13:56:03 2017 -0700 # Node ID 7443b61c183222c05fac17b50cad593977125e22 # Parent 8959e2938bffaab3045b15adfba340b2cd180bff 8186537: remove unnecessary @requires from hotspot/compiler/aot tests Reviewed-by: duke diff --git a/test/compiler/aot/DeoptimizationTest.java b/test/compiler/aot/DeoptimizationTest.java --- a/test/compiler/aot/DeoptimizationTest.java +++ b/test/compiler/aot/DeoptimizationTest.java @@ -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 diff --git a/test/compiler/aot/RecompilationTest.java b/test/compiler/aot/RecompilationTest.java --- a/test/compiler/aot/RecompilationTest.java +++ b/test/compiler/aot/RecompilationTest.java @@ -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 diff --git a/test/compiler/aot/SharedUsageTest.java b/test/compiler/aot/SharedUsageTest.java --- a/test/compiler/aot/SharedUsageTest.java +++ b/test/compiler/aot/SharedUsageTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java b/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java b/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java b/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java b/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java b/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java b/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java b/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java b/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java --- a/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java +++ b/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java b/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java --- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java +++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java b/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java --- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java +++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java b/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java --- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java +++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java b/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java --- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java +++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java b/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java --- a/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java +++ b/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java --- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java +++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java --- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java +++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java --- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java +++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java --- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java +++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java --- a/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java +++ b/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java b/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java --- a/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java +++ b/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java b/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java --- a/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java +++ b/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java @@ -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 diff --git a/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java b/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java --- a/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java +++ b/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java @@ -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 diff --git a/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java b/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java --- a/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java +++ b/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java @@ -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 diff --git a/test/compiler/aot/cli/IncorrectAOTLibraryTest.java b/test/compiler/aot/cli/IncorrectAOTLibraryTest.java --- a/test/compiler/aot/cli/IncorrectAOTLibraryTest.java +++ b/test/compiler/aot/cli/IncorrectAOTLibraryTest.java @@ -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 diff --git a/test/compiler/aot/cli/MultipleAOTLibraryTest.java b/test/compiler/aot/cli/MultipleAOTLibraryTest.java --- a/test/compiler/aot/cli/MultipleAOTLibraryTest.java +++ b/test/compiler/aot/cli/MultipleAOTLibraryTest.java @@ -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 diff --git a/test/compiler/aot/cli/NonExistingAOTLibraryTest.java b/test/compiler/aot/cli/NonExistingAOTLibraryTest.java --- a/test/compiler/aot/cli/NonExistingAOTLibraryTest.java +++ b/test/compiler/aot/cli/NonExistingAOTLibraryTest.java @@ -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 */ diff --git a/test/compiler/aot/cli/SingleAOTLibraryTest.java b/test/compiler/aot/cli/SingleAOTLibraryTest.java --- a/test/compiler/aot/cli/SingleAOTLibraryTest.java +++ b/test/compiler/aot/cli/SingleAOTLibraryTest.java @@ -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 diff --git a/test/compiler/aot/cli/SingleAOTOptionTest.java b/test/compiler/aot/cli/SingleAOTOptionTest.java --- a/test/compiler/aot/cli/SingleAOTOptionTest.java +++ b/test/compiler/aot/cli/SingleAOTOptionTest.java @@ -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 diff --git a/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java b/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java --- a/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java +++ b/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java @@ -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 diff --git a/test/compiler/aot/cli/jaotc/CompileClassTest.java b/test/compiler/aot/cli/jaotc/CompileClassTest.java --- a/test/compiler/aot/cli/jaotc/CompileClassTest.java +++ b/test/compiler/aot/cli/jaotc/CompileClassTest.java @@ -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 diff --git a/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java b/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java --- a/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java +++ b/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java @@ -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 diff --git a/test/compiler/aot/cli/jaotc/CompileJarTest.java b/test/compiler/aot/cli/jaotc/CompileJarTest.java --- a/test/compiler/aot/cli/jaotc/CompileJarTest.java +++ b/test/compiler/aot/cli/jaotc/CompileJarTest.java @@ -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 diff --git a/test/compiler/aot/cli/jaotc/CompileModuleTest.java b/test/compiler/aot/cli/jaotc/CompileModuleTest.java --- a/test/compiler/aot/cli/jaotc/CompileModuleTest.java +++ b/test/compiler/aot/cli/jaotc/CompileModuleTest.java @@ -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 */ diff --git a/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java b/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java --- a/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java +++ b/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java @@ -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 diff --git a/test/compiler/aot/cli/jaotc/ListOptionTest.java b/test/compiler/aot/cli/jaotc/ListOptionTest.java --- a/test/compiler/aot/cli/jaotc/ListOptionTest.java +++ b/test/compiler/aot/cli/jaotc/ListOptionTest.java @@ -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 diff --git a/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java b/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java --- a/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java +++ b/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java @@ -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 diff --git a/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java b/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java --- a/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java +++ b/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java @@ -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 */ diff --git a/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java b/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java --- a/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java +++ b/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java @@ -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 diff --git a/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java b/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java --- a/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java +++ b/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java @@ -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 diff --git a/test/compiler/aot/verification/vmflags/TrackedFlagTest.java b/test/compiler/aot/verification/vmflags/TrackedFlagTest.java --- a/test/compiler/aot/verification/vmflags/TrackedFlagTest.java +++ b/test/compiler/aot/verification/vmflags/TrackedFlagTest.java @@ -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