stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8210259: [testbug] IncompatibleOptions.java fails if VM configured without ZGC

Browse Source 
Reviewed-by: pliden, kbarrett
This commit is contained in:
Goetz Lindenmaier 2018-09-01 18:15:27 +02:00
parent c8d641d148
commit 73537725b1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java
View File

@ -41,6 +41,7 @@ import jdk.test.lib.Platform;
import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.code.Compiler;
import sun.hotspot.gc.GC;
public class IncompatibleOptions {
static final String COOPS_DUMP_WARNING =
@ -63,7 +64,7 @@ public class IncompatibleOptions {
// Uncompressed OOPs
testDump(1, "-XX:+UseG1GC", "-XX:-UseCompressedOops", COOPS_DUMP_WARNING, true);
if (Platform.isLinux() && Platform.isX64()) {
if (GC.Z.isSupported()) { // ZGC is included in build.
testDump(1, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseZGC", COOPS_DUMP_WARNING, true);
}

4
test/lib/sun/hotspot/gc/GC.java
View File

@ -31,7 +31,7 @@ import sun.hotspot.WhiteBox;
*/
public enum GC {
/*
* Enum values much match CollectedHeap::Name
* Enum values must match CollectedHeap::Name
*/
Serial(1),
Parallel(2),
@ -49,7 +49,7 @@ public enum GC {
}
/**
* @return true if this GC is supported by the VM
* @return true if this GC is supported by the VM, i.e., it is built into the VM.
*/
public boolean isSupported() {
return WB.isGCSupported(name);