8185046: jtreg: introduce keyword to disable aot tests

Reviewed-by: kvn, stuefe
2026-03-03 04:30:06 +00:00 · 2017-07-21 12:43:47 +02:00 · 2017-07-21 12:43:47 +02:00 · 6c11fd01db
commit 6c11fd01db
parent 9ce1967658
61 changed files with 62 additions and 2 deletions
--- a/hotspot/test/TEST.ROOT
+++ b/hotspot/test/TEST.ROOT
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -27,7 +27,7 @@
 # It also contains test-suite configuration information.

 # The list of keywords supported in this test suite
-keys=cte_test jcmd nmt regression gc stress
+keys=aot cte_test jcmd nmt regression gc stress

 groups=TEST.groups [closed/TEST.groups]

--- a/hotspot/test/compiler/aot/DeoptimizationTest.java
+++ b/hotspot/test/compiler/aot/DeoptimizationTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/RecompilationTest.java
+++ b/hotspot/test/compiler/aot/RecompilationTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/SharedUsageTest.java
+++ b/hotspot/test/compiler/aot/SharedUsageTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @ignore 8132547
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @ignore 8132547
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @ignore 8132547
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @ignore 8132547
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.org.objectweb.asm
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.org.objectweb.asm
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java
+++ b/hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @build compiler.aot.cli.DisabledAOTWithLibraryTest
--- a/hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java
+++ b/hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java
+++ b/hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java
+++ b/hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java
+++ b/hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib / /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java
+++ b/hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /testlibrary /
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /testlibrary/ /test/lib
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /test/lib /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /test/lib /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /test/lib /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /test/lib /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /test/lib /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /test/lib /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library / /test/lib /testlibrary
 * @modules java.base/jdk.internal.misc
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java
@ -23,6 +23,7 @@

 /**
 * @test
+ * @key 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/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java
@ -23,6 +23,7 @@

 /**
 * @test
+ * @key aot
 * @modules jdk.aot/jdk.tools.jaotc
 *          jdk.aot/jdk.tools.jaotc.collect
 * @run junit/othervm jdk.tools.jaotc.test.collect.ClassSearchTest
--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java
@ -23,6 +23,7 @@

 /**
 * @test
+ * @key aot
 * @modules jdk.aot/jdk.tools.jaotc
 *          jdk.aot/jdk.tools.jaotc.collect
 * @build jdk.tools.jaotc.test.collect.Utils
--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java
@ -23,6 +23,7 @@

 /**
 * @test
+ * @key aot
 * @modules jdk.aot/jdk.tools.jaotc
 *          jdk.aot/jdk.tools.jaotc.collect
 *
--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java
@ -23,6 +23,7 @@

 /**
 * @test
+ * @key aot
 * @modules jdk.aot/jdk.tools.jaotc
 *          jdk.aot/jdk.tools.jaotc.collect
 *          jdk.aot/jdk.tools.jaotc.collect.directory
--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java
@ -23,6 +23,7 @@

 /**
 * @test
+ * @key aot
 * @modules jdk.aot/jdk.tools.jaotc
 *          jdk.aot/jdk.tools.jaotc.collect
 *          jdk.aot/jdk.tools.jaotc.collect.jar
--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java
@ -23,6 +23,7 @@

 /**
 * @test
+ * @key aot
 * @modules jdk.aot/jdk.tools.jaotc
 *          jdk.aot/jdk.tools.jaotc.collect
 *          jdk.aot/jdk.tools.jaotc.collect.module
--- a/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java
+++ b/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java
+++ b/hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc
--- a/hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java
+++ b/hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java
@ -23,6 +23,7 @@

 /*
 * @test
+ * @key aot
 * @library /test/lib /
 * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
 * @modules java.base/jdk.internal.misc