Skip to content

Commit c2f0ef5

Browse files
committed
8346159: Disable CDS AOTClassLinking tests for JVMCI due to JDK-8345635
Reviewed-by: dnsimon, dholmes
1 parent 4b21fb9 commit c2f0ef5

File tree

5 files changed

+14
-0
lines changed

5 files changed

+14
-0
lines changed

test/hotspot/jtreg/runtime/cds/appcds/LambdaWithUseImplMethodHandle.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
* @bug 8290417
2828
* @summary CDS cannot archive lambda proxy with useImplMethodHandle
2929
* @requires vm.cds
30+
* @requires vm.cds.supports.aot.class.linking
31+
* @comment work around JDK-8345635
32+
* @requires !vm.jvmci.enabled
3033
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
3134
* @build pkg1.BaseWithProtectedMethod
3235
* @build pkg2.Child

test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
/*
3030
* @test id=static
3131
* @requires vm.cds.supports.aot.class.linking
32+
* @comment work around JDK-8345635
33+
* @requires !vm.jvmci.enabled
3234
* @library /test/jdk/lib/testlibrary /test/lib
3335
* @build InitiatingLoaderTester
3436
* @build BulkLoaderTest
@@ -39,6 +41,8 @@
3941
/*
4042
* @test id=dynamic
4143
* @requires vm.cds.supports.aot.class.linking
44+
* @comment work around JDK-8345635
45+
* @requires !vm.jvmci.enabled
4246
* @library /test/jdk/lib/testlibrary /test/lib
4347
* @build InitiatingLoaderTester
4448
* @build jdk.test.whitebox.WhiteBox BulkLoaderTest

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
* @bug 8214781 8293187
2828
* @summary Test for the -XX:ArchiveHeapTestClass flag
2929
* @requires vm.debug == true & vm.cds.write.archived.java.heap
30+
* @requires vm.cds.supports.aot.class.linking
31+
* @comment work around JDK-8345635
32+
* @requires !vm.jvmci.enabled
3033
* @modules java.logging
3134
* @library /test/jdk/lib/testlibrary /test/lib
3235
* /test/hotspot/jtreg/runtime/cds/appcds

test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedLambdas.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
* @bug 8340836
2929
* @requires vm.cds
3030
* @requires vm.cds.supports.aot.class.linking
31+
* @comment work around JDK-8345635
32+
* @requires !vm.jvmci.enabled
3133
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes/
3234
* @build AOTLinkedLambdas
3335
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar

test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
* @bug 8343245
2929
* @requires vm.cds
3030
* @requires vm.cds.supports.aot.class.linking
31+
* @comment work around JDK-8345635
32+
* @requires !vm.jvmci.enabled
3133
* @library /test/lib
3234
* @build AOTLinkedVarHandles
3335
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar

0 commit comments

Comments
 (0)