1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8357591: Re-enable CDS test cases for jvmci after JDK-8345826

Browse Source 
Reviewed-by: dholmes, kvn
This commit is contained in:
Ioi Lam 2025-06-09 21:54:55 +00:00
parent ef45c8154c
commit d186dacdb7
34 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/runtime/cds/appcds/LambdaWithUseImplMethodHandle.java
View File

@ -28,8 +28,6 @@
* @summary CDS cannot archive lambda proxy with useImplMethodHandle
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @build pkg1.BaseWithProtectedMethod
* @build pkg2.Child

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
View File

@ -27,8 +27,6 @@
* @summary Test AOT cache support for array classes in custom class loaders.
* @bug 8353298 8356838
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @build ReturnIntegerAsString
* @build AOTCacheSupportForCustomLoaders

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java
View File

@ -26,8 +26,6 @@
* @test
* @summary Test how various AOT optimizations handle classes that are excluded from the AOT cache.
* @requires vm.cds.write.archived.java.heap
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib
* /test/hotspot/jtreg/runtime/cds/appcds/aotCache/test-classes
* @build ExcludedClasses CustyWithLoop

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/HelloAOTCache.java
View File

@ -27,8 +27,6 @@
* @test
* @summary Sanity test for AOTCache
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build HelloAOTCache
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar HelloAOTCacheApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgent.java
View File

@ -28,8 +28,6 @@
* @summary -javaagent should be allowed in AOT workflow. However, classes transformed/redefined by agents will not
* be cached.
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @build JavaAgent JavaAgentTransformer Util
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar JavaAgentApp JavaAgentApp$ShouldBeTransformed

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/ManagementAgent.java
View File

@ -28,8 +28,6 @@
* @bug 8352187
* @summary ManagementAgent will not be started during AOT cache creation.
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build HelloAOTCache
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar HelloAOTCacheApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/PackageInfoClass.java
View File

@ -27,8 +27,6 @@
* @summary AOT cache handling for package-info class loaded by jdk/internal/loader/ClassLoaders$BootClassLoader
* @bug 8354558
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/jdk/java/lang/Package/bootclasspath/boot
* @build PackageInfoClass foo.Foo foo.MyAnnotation foo.package-info
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boot.jar foo.Foo foo.package-info foo.MyAnnotation

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/SpecialCacheNames.java
View File

@ -27,8 +27,6 @@
* @summary Use special characters in the name of the cache file specified by -XX:AOTCacheOutput
* Make sure these characters are passed to the child JVM process that assembles the cache.
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build SpecialCacheNames
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java
View File

@ -26,8 +26,6 @@
* @test
* @summary Sanity test for AOTCache
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build VerifierFailOver_Helper
* @build VerifierFailOver

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java
View File

@ -28,8 +28,6 @@
* @bug 8352775
* @requires vm.cds
* @requires vm.gc.Z
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build AOTCacheWithZGC
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar AOTCacheWithZGCApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTLoaderConstraintsTest.java
View File

@ -26,8 +26,6 @@
* @test Make sure loader constraints are passed from AOT preimage to final image.
* @bug 8348426
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib
* @build AOTLoaderConstraintsTest BootClass
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boot.jar BootClass

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java
View File

@ -28,8 +28,6 @@
* @bug 8352437
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @run driver AddExports
*/

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddOpens.java
View File

@ -26,8 +26,6 @@
* @test
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @run driver AddOpens
* @summary sanity test the --add-opens option

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java
View File

@ -27,8 +27,6 @@
* @bug 8354083
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @run driver AddReads
* @summary sanity test the --add-reads option

6
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
View File

@ -29,8 +29,6 @@
/*
* @test id=static
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @build InitiatingLoaderTester BadOldClassA BadOldClassB
* @build jdk.test.whitebox.WhiteBox BulkLoaderTest SimpleCusty
@ -45,8 +43,6 @@
/*
* @test id=dynamic
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @build InitiatingLoaderTester BadOldClassA BadOldClassB
* @build jdk.test.whitebox.WhiteBox BulkLoaderTest SimpleCusty
@ -61,8 +57,6 @@
/*
* @test id=aot
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @build jdk.test.whitebox.WhiteBox InitiatingLoaderTester BadOldClassA BadOldClassB
* @build BulkLoaderTest SimpleCusty

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/FakeCodeLocation.java
View File

@ -26,8 +26,6 @@
* @test Do not cache classes that are loaded from a fake location.
* @bug 8352001
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib
* @build FakeCodeLocation
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar FakeCodeLocationApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/GeneratedInternedString.java
View File

@ -28,8 +28,6 @@
* @requires vm.cds.write.archived.java.heap
* @requires vm.cds.supports.aot.class.linking
* @requires vm.debug
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @build GeneratedInternedString
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar GeneratedInternedStringApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/LambdaInExcludedClass.java
View File

@ -27,8 +27,6 @@
* @bug 8349888
* @requires vm.cds.supports.aot.class.linking
* @requires vm.gc.Epsilon
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib
* @build LambdaInExcludedClass
* @run driver jdk.test.lib.helpers.ClassFileInstaller LambdaInExcludedClassApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
View File

@ -27,8 +27,6 @@
* @requires vm.cds.write.archived.java.heap
* @requires vm.cds.supports.aot.class.linking
* @requires vm.debug
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @build MethodHandleTest
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar mh.jar

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal.java
View File

@ -27,8 +27,6 @@
* @summary Handling of non-final static string that has an initial value
* @bug 8356125
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build NonFinalStaticWithInitVal_Helper
* @build NonFinalStaticWithInitVal

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/StringConcatStress.java
View File

@ -34,8 +34,6 @@
/*
* @test id=aot
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build StringConcatStress
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar StringConcatStressApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TestSetupAOTTest.java
View File

@ -28,8 +28,6 @@
* is used for running HotSpot tests in the "AOT mode"
* (E.g., make test JTREG=AOT_JDK=true TEST=open/test/hotspot/jtreg/runtime/invokedynamic)
* @requires vm.cds
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/setup_aot
* @build TestSetupAOTTest JavacBenchApp TestSetupAOT
* @run driver jdk.test.lib.helpers.ClassFileInstaller

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TrainingRun.java
View File

@ -27,8 +27,6 @@
* @summary -XX:AOTMode=record should not interfere with app execution: (1) thread creation; (2) exit code
* @bug 8351327
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib
* @build TrainingRun
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp

2
test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
View File

@ -27,8 +27,6 @@
* @requires vm.cds.write.archived.java.heap
* @requires vm.cds.supports.aot.class.linking
* @requires vm.debug
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
* @build WeakReferenceTest
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar weakref.jar

2
test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java
View File

@ -26,8 +26,6 @@
* @test
* @summary Sanity test of combinations of the diagnostic flags [+-]AOTRecordTraining and [+-]AOTReplayTraining
* @requires vm.cds
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @requires vm.cds.supports.aot.class.linking
* @requires vm.flagless
* @library /test/lib /test/setup_aot /test/hotspot/jtreg/runtime/cds/appcds/test-classes

2
test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java
View File

@ -28,8 +28,6 @@
* @summary Test for the -XX:ArchiveHeapTestClass flag
* @requires vm.debug == true & vm.cds.write.archived.java.heap
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @modules java.logging
* @library /test/jdk/lib/testlibrary /test/lib
* /test/hotspot/jtreg/runtime/cds/appcds

2
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesAsCollectorTest.java
View File

@ -28,8 +28,6 @@
* @summary Run the MethodHandlesAsCollectorTest.java test in CDSAppTester::AOT workflow.
* @requires vm.cds & vm.compMode != "Xcomp"
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @comment Some of the tests run excessively slowly with -Xcomp. The original
* tests aren't executed with -Xcomp in the CI pipeline, so let's exclude
* the generated tests from -Xcomp execution as well.

2
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesCastFailureTest.java
View File

@ -28,8 +28,6 @@
* @summary Run the MethodHandlesCastFailureTest.java test in CDSAppTester::AOT workflow.
* @requires vm.cds & vm.compMode != "Xcomp"
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @comment Some of the tests run excessively slowly with -Xcomp. The original
* tests aren't executed with -Xcomp in the CI pipeline, so let's exclude
* the generated tests from -Xcomp execution as well.

2
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesGeneralTest.java
View File

@ -28,8 +28,6 @@
* @summary Run the MethodHandlesGeneralTest.java test in CDSAppTester::AOT workflow.
* @requires vm.cds & vm.compMode != "Xcomp"
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @comment Some of the tests run excessively slowly with -Xcomp. The original
* tests aren't executed with -Xcomp in the CI pipeline, so let's exclude
* the generated tests from -Xcomp execution as well.

2
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesInvokersTest.java
View File

@ -28,8 +28,6 @@
* @summary Run the MethodHandlesInvokersTest.java test in CDSAppTester::AOT workflow.
* @requires vm.cds & vm.compMode != "Xcomp"
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @comment Some of the tests run excessively slowly with -Xcomp. The original
* tests aren't executed with -Xcomp in the CI pipeline, so let's exclude
* the generated tests from -Xcomp execution as well.

2
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesPermuteArgumentsTest.java
View File

@ -28,8 +28,6 @@
* @summary Run the MethodHandlesPermuteArgumentsTest.java test in CDSAppTester::AOT workflow.
* @requires vm.cds & vm.compMode != "Xcomp"
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @comment Some of the tests run excessively slowly with -Xcomp. The original
* tests aren't executed with -Xcomp in the CI pipeline, so let's exclude
* the generated tests from -Xcomp execution as well.

2
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesSpreadArgumentsTest.java
View File

@ -28,8 +28,6 @@
* @summary Run the MethodHandlesSpreadArgumentsTest.java test in CDSAppTester::AOT workflow.
* @requires vm.cds & vm.compMode != "Xcomp"
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @comment Some of the tests run excessively slowly with -Xcomp. The original
* tests aren't executed with -Xcomp in the CI pipeline, so let's exclude
* the generated tests from -Xcomp execution as well.

2
test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedLambdas.java
View File

@ -28,8 +28,6 @@
* @bug 8340836
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes/
* @build AOTLinkedLambdas
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar

2
test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java
View File

@ -28,8 +28,6 @@
* @bug 8343245
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib
* @build AOTLinkedVarHandles
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar