diff -r f0312c7d5b37 -r ba6c248cae19 test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java --- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Wed Nov 13 11:21:15 2019 +0100 +++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Wed Nov 13 11:37:29 2019 +0100 @@ -50,7 +50,7 @@ // shared base address test table private static final String[] testTable = { - "-XX:+UseG1GC", "-XX:+UseSerialGC", "-XX:+UseParallelGC", "-XX:+UseConcMarkSweepGC", + "-XX:+UseG1GC", "-XX:+UseSerialGC", "-XX:+UseParallelGC", "-XX:+FlightRecorder", "-XX:+UseLargePages", // may only take effect on machines with large-pages "-XX:+UseCompressedClassPointers", @@ -123,18 +123,11 @@ } } - if (Compiler.isGraalEnabled() && testEntry.equals("-XX:+UseConcMarkSweepGC")) - { - System.out.println("Graal does not support CMS"); - return true; - } - if (!WhiteBox.getWhiteBox().isJFRIncludedInVmBuild() && testEntry.equals("-XX:+FlightRecorder")) { System.out.println("JFR does not exist"); return true; } - return false; } }