OpenJDK / jdk / hs
changeset 46987:21919641299f
8186144: [Graal] some tests fail with: Improperly specified VM option UseJVMCICompiler: EnableJVMCI cannot be disabled
Summary: disable Graal by switching off UseJVMCICompiler when JVMCI is disabled
Reviewed-by: twisti
| author | kvn |
|---|---|
| date | Fri, 25 Aug 2017 18:21:47 -0700 |
| parents | 26697fda7a45 |
| children | ede2513b035e |
| files | hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java |
| diffstat | 4 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java Tue Aug 22 15:12:26 2017 +0200 +++ b/hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java Fri Aug 25 18:21:47 2017 -0700 @@ -43,11 +43,11 @@ * compiler.jvmci.SecurityRestrictionsTest * ALL_PERM * @run main/othervm -XX:+UnlockExperimentalVMOptions - * -XX:+EnableJVMCI + * -XX:+EnableJVMCI -XX:-UseJVMCICompiler * compiler.jvmci.SecurityRestrictionsTest * NO_JVMCI_ACCESS_PERM * @run main/othervm -XX:+UnlockExperimentalVMOptions - * -XX:-EnableJVMCI + * -XX:-EnableJVMCI -XX:-UseJVMCICompiler * compiler.jvmci.SecurityRestrictionsTest * NO_JVMCI */
--- a/hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java Tue Aug 22 15:12:26 2017 +0200 +++ b/hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java Fri Aug 25 18:21:47 2017 -0700 @@ -61,7 +61,6 @@ = new DisassembleCodeBlobTest(); List<CompileCodeTestCase> testCases = CompileCodeTestCase.generate(/* bci = */ -1); - testCases.addAll(CompileCodeTestCase.generate(/* bci = */ 0)); testCases.forEach(test::check); testCases.stream().findAny().ifPresent(test::checkZero); test.checkNull();
--- a/hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java Tue Aug 22 15:12:26 2017 +0200 +++ b/hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java Fri Aug 25 18:21:47 2017 -0700 @@ -35,9 +35,8 @@ * compiler.jvmci.compilerToVM.JVM_RegisterJVMCINatives * @run main/othervm -XX:+UnlockExperimentalVMOptions * -Dcompiler.jvmci.compilerToVM.JVM_RegisterJVMCINatives.positive=false - * -XX:-EnableJVMCI + * -XX:-EnableJVMCI -XX:-UseJVMCICompiler * compiler.jvmci.compilerToVM.JVM_RegisterJVMCINatives - */ package compiler.jvmci.compilerToVM;
--- a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java Tue Aug 22 15:12:26 2017 +0200 +++ b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java Fri Aug 25 18:21:47 2017 -0700 @@ -74,7 +74,7 @@ "Unexpected exit code with -EnableJVMCI", "Unexpected output with -EnableJVMCI", ExitCode.OK, addTestVMOptions, "-XX:+UnlockExperimentalVMOptions", - "-XX:-EnableJVMCI", "-Xbootclasspath/a:.", + "-XX:-EnableJVMCI", "-XX:-UseJVMCICompiler", "-Xbootclasspath/a:.", JvmciShutdownEventListener.class.getName() ); }