# HG changeset patch # User jiefu # Date 1573019005 -28800 # Node ID bb2a436e616ccf7e51f6bf23780a2cd8bbe44e28 # Parent e940d13a2ed3dd69c128d0776152cb0e64a07993 8233659: [TESTBUG] runtime/cds/appcds/CommandLineFlagCombo.java fails when jfr is disabled Reviewed-by: iklam diff -r e940d13a2ed3 -r bb2a436e616c test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java --- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Tue Nov 05 20:27:21 2019 -0800 +++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java Wed Nov 06 13:43:25 2019 +0800 @@ -44,6 +44,7 @@ import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.code.Compiler; +import sun.hotspot.WhiteBox; public class CommandLineFlagCombo { @@ -128,6 +129,12 @@ return true; } + if (!WhiteBox.getWhiteBox().isJFRIncludedInVmBuild() && testEntry.equals("-XX:+FlightRecorder")) + { + System.out.println("JFR does not exist"); + return true; + } + return false; } }