8191401: [TESTBUG] serviceability/sa/ClhsdbFlags.java can fail due to UseJVMCICompiler

Reviewed-by: dholmes, jgeorge
This commit is contained in:
Sharath Ballal 2017-11-21 11:27:46 +05:30
parent 4bdc34dde5
commit f0d620789d

View File

@ -48,7 +48,7 @@ public class ClhsdbFlags {
ClhsdbLauncher test = new ClhsdbLauncher(); ClhsdbLauncher test = new ClhsdbLauncher();
List<String> vmArgs = new ArrayList<String>(); List<String> vmArgs = new ArrayList<String>();
vmArgs.add("-XX:+UnlockExperimentalVMOptions"); vmArgs.add("-XX:+UnlockExperimentalVMOptions");
vmArgs.add("-XX:+UseJVMCICompiler"); vmArgs.add("-XX:+UnlockDiagnosticVMOptions");
vmArgs.add("-XX:-MaxFDLimit"); vmArgs.add("-XX:-MaxFDLimit");
vmArgs.addAll(Utils.getVmOptions()); vmArgs.addAll(Utils.getVmOptions());
theApp = LingeredApp.startApp(vmArgs); theApp = LingeredApp.startApp(vmArgs);
@ -56,25 +56,24 @@ public class ClhsdbFlags {
List<String> cmds = List.of( List<String> cmds = List.of(
"flags", "flags -nd", "flags", "flags -nd",
"flags UseJVMCICompiler", "flags MaxFDLimit", "flags UnlockDiagnosticVMOptions", "flags MaxFDLimit",
"flags MaxJavaStackTraceDepth"); "flags MaxJavaStackTraceDepth");
Map<String, List<String>> expStrMap = new HashMap<>(); Map<String, List<String>> expStrMap = new HashMap<>();
expStrMap.put("flags", List.of( expStrMap.put("flags", List.of(
"UseJVMCICompiler = true", "UnlockDiagnosticVMOptions = true",
"MaxFDLimit = false", "MaxFDLimit = false",
"MaxJavaStackTraceDepth = 1024", "MaxJavaStackTraceDepth = 1024",
"UseCompressedClassPointers", "VerifyMergedCPBytecodes", "VerifyMergedCPBytecodes",
"ConcGCThreads", "UseThreadPriorities", "ConcGCThreads", "UseThreadPriorities",
"UseInterpreter", "StartFlightRecording", "ShowHiddenFrames"));
"ShowHiddenFrames", "UseAppCDS"));
expStrMap.put("flags -nd", List.of( expStrMap.put("flags -nd", List.of(
"UseJVMCICompiler = true", "UnlockDiagnosticVMOptions = true",
"MaxFDLimit = false", "MaxFDLimit = false",
"UseCompressedClassPointers", "InitialHeapSize",
"ConcGCThreads")); "MaxHeapSize"));
expStrMap.put("flags UseJVMCICompiler", List.of( expStrMap.put("flags UnlockDiagnosticVMOptions", List.of(
"UseJVMCICompiler = true")); "UnlockDiagnosticVMOptions = true"));
expStrMap.put("flags MaxFDLimit", List.of( expStrMap.put("flags MaxFDLimit", List.of(
"MaxFDLimit = false")); "MaxFDLimit = false"));
expStrMap.put("flags MaxJavaStackTraceDepth", List.of( expStrMap.put("flags MaxJavaStackTraceDepth", List.of(