mirror of
https://github.com/darlinghq/darling-openjdk.git
synced 2024-12-02 17:36:50 +00:00
8231503: [TESTBUG] compiler/{jvmci,aot} tests should not run with GCs that do not support JVMCI/AOT
Reviewed-by: kvn, dlong, stefank
This commit is contained in:
parent
8fc1b67944
commit
4cdb9708c4
@ -235,7 +235,22 @@ public class VMProps implements Callable<Map<String, String>> {
|
||||
*/
|
||||
protected String vmJvmci() {
|
||||
// builds with jvmci have this flag
|
||||
return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null);
|
||||
if (WB.getBooleanVMFlag("EnableJVMCI") == null) {
|
||||
return "false";
|
||||
}
|
||||
|
||||
switch (GC.selected()) {
|
||||
case Serial:
|
||||
case Parallel:
|
||||
case G1:
|
||||
// These GCs are supported with JVMCI
|
||||
return "true";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// Every other GC is not supported
|
||||
return "false";
|
||||
}
|
||||
|
||||
/**
|
||||
@ -356,7 +371,24 @@ public class VMProps implements Callable<Map<String, String>> {
|
||||
} else {
|
||||
jaotc = bin.resolve("jaotc");
|
||||
}
|
||||
return "" + Files.exists(jaotc);
|
||||
|
||||
if (!Files.exists(jaotc)) {
|
||||
// No jaotc => no AOT
|
||||
return "false";
|
||||
}
|
||||
|
||||
switch (GC.selected()) {
|
||||
case Serial:
|
||||
case Parallel:
|
||||
case G1:
|
||||
// These GCs are supported with AOT
|
||||
return "true";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// Every other GC is not supported
|
||||
return "false";
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user