8309542: compiler/jvmci/TestEnableJVMCIProduct.java fails with "JVMCI compiler 'graal' specified by jvmci.Compiler not found"

Reviewed-by: kvn, never
This commit is contained in:
Doug Simon 2023-06-06 16:12:37 +00:00
parent 38cef2adbd
commit 0f0fda7abc

@ -94,13 +94,16 @@ public class TestEnableJVMCIProduct {
for (Expectation expectation : expectations) {
output.stdoutShouldMatch(expectation.pattern);
}
if (flag.equals("-XX:+UseGraalJIT")) {
output.shouldContain("jvmci.Compiler=graal");
}
if (output.getExitValue() != 0) {
// This should only happen when JVMCI compilation is requested and the VM has no
// JVMCI compiler (e.g. Graal is not included in the build)
output.stdoutShouldMatch("No JVMCI compiler found");
if (flag.equals("-XX:+UseGraalJIT")) {
output.shouldContain("JVMCI compiler 'graal' specified by jvmci.Compiler not found");
} else {
output.stdoutShouldMatch("No JVMCI compiler found");
}
} else if (flag.equals("-XX:+UseGraalJIT")) {
output.shouldContain("jvmci.Compiler=graal");
}
}
}