Skip to content

Commit baf717f

Browse files
committed
8309974: some JVMCI tests fail when VM options include -XX:+EnableJVMCI
Backport-of: 8b4af46be4447a7bc3b58f4054488e8bc50ee111
1 parent a81b088 commit baf717f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* @build compiler.jvmci.common.JVMCIHelpers
3737
* compiler.jvmci.events.JvmciShutdownEventListener
38-
* @run driver jdk.test.lib.FileInstaller ./JvmciShutdownEventTest.config
38+
* @run main/othervm jdk.test.lib.FileInstaller ./JvmciShutdownEventTest.config
3939
* ./META-INF/services/jdk.vm.ci.services.JVMCIServiceLocator
40-
* @run driver jdk.test.lib.helpers.ClassFileInstaller
40+
* @run main/othervm jdk.test.lib.helpers.ClassFileInstaller
4141
* compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
4242
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory
4343
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* java.base/jdk.internal.misc
3232
* @library /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
3333
* @build jdk.vm.ci.hotspot.test.DummyClass
34-
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.vm.ci.hotspot.test.DummyClass
34+
* @run main/othervm jdk.test.lib.helpers.ClassFileInstaller jdk.vm.ci.hotspot.test.DummyClass
3535
* @run testng/othervm/timeout=300 -Xbootclasspath/a:.
3636
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
3737
* -XX:-UseJVMCICompiler jdk.vm.ci.hotspot.test.HotSpotConstantReflectionProviderTest

test/hotspot/jtreg/compiler/jvmci/meta/StableFieldTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* jdk.internal.vm.ci/jdk.vm.ci.runtime
3434
*
3535
* @compile StableFieldTest.java
36-
* @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.jvmci.meta.StableFieldTest
36+
* @run main/othervm jdk.test.lib.helpers.ClassFileInstaller compiler.jvmci.meta.StableFieldTest
3737
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler -Xbootclasspath/a:. compiler.jvmci.meta.StableFieldTest
3838
*/
3939

0 commit comments

Comments
 (0)