# HG changeset patch # User sla # Date 1398408934 -7200 # Node ID 19c6d44b6550e359aa2cd0a6848d9e7397443b24 # Parent 9f9b4ba34aadc4b44ea2b49fe4b7fd9d8700c396 8038947: HotSpotDiagnosticMXBean/CheckOrigin.java 'NewSize' should have origin 'ERGONOMIC' but had 'DEFAULT' Reviewed-by: mchung, jbachorik diff -r 9f9b4ba34aad -r 19c6d44b6550 jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java --- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java Fri Apr 25 10:57:09 2014 +0800 +++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java Fri Apr 25 08:55:34 2014 +0200 @@ -58,6 +58,7 @@ ProcessBuilder pb = ProcessTools. createJavaProcessBuilder( + "-XX:+UseConcMarkSweepGC", // this will cause UseParNewGC to be FLAG_SET_ERGO "-XX:+PrintGCDetails", "-XX:Flags=" + flagsFile.getAbsolutePath(), "-cp", System.getProperty("test.class.path") + File.pathSeparator + getToolsJarPath(), @@ -84,12 +85,20 @@ setOptionUsingAttach("HeapDumpPath", "/a/sample/path"); // check the origin field for all the options we set + + // Not set, so should be default checkOrigin("ManagementServer", Origin.DEFAULT); + // Set on the command line checkOrigin("PrintGCDetails", Origin.VM_CREATION); + // Set in _JAVA_OPTIONS checkOrigin("PrintOopAddress", Origin.ENVIRON_VAR); + // Set in -XX:Flags file checkOrigin("PrintSafepointStatistics", Origin.CONFIG_FILE); + // Set through j.l.m checkOrigin("HeapDumpOnOutOfMemoryError", Origin.MANAGEMENT); - checkOrigin("NewSize", Origin.ERGONOMIC); + // Should be set by the VM, when we set UseConcMarkSweepGC + checkOrigin("UseParNewGC", Origin.ERGONOMIC); + // Set using attach checkOrigin("HeapDumpPath", Origin.ATTACH_ON_DEMAND); } }