--- old/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java 2018-06-26 21:56:48.048000000 -0700 +++ new/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java 2018-06-26 21:56:47.860000000 -0700 @@ -58,7 +58,7 @@ File flagsFile = File.createTempFile("CheckOriginFlags", null); try (PrintWriter pw = new PrintWriter(new FileWriter(flagsFile))) { - pw.println("+PrintSafepointStatistics"); + pw.println("+PrintVMQWaitTime"); } ProcessBuilder pb = ProcessTools. @@ -108,7 +108,7 @@ checkOrigin("IgnoreUnrecognizedVMOptions", Origin.ENVIRON_VAR); checkOrigin("PrintVMOptions", Origin.ENVIRON_VAR); // Set in -XX:Flags file - checkOrigin("PrintSafepointStatistics", Origin.CONFIG_FILE); + checkOrigin("PrintVMQWaitTime", Origin.CONFIG_FILE); // Set through j.l.m checkOrigin("HeapDumpOnOutOfMemoryError", Origin.MANAGEMENT); // Should be set by the VM, when we set UseConcMarkSweepGC