From c3bf5486affb2dcf2eddd12ed59fbeac2a695c12 Mon Sep 17 00:00:00 2001 From: Jeremy Manson Date: Fri, 17 Jul 2015 10:48:57 -0700 Subject: [PATCH] 8079301: Some command line options not settable via JAVA_TOOL_OPTIONS Ensures special-cased command line options are settable via _JAVA_OPTIONS and JAVA_TOOL_OPTIONS. Reviewed-by: coleenp, ddmitriev --- .../HotSpotDiagnosticMXBean/CheckOrigin.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java index a93b7f07490..6f3ac9feec5 100644 --- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java +++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java @@ -63,13 +63,18 @@ public class CheckOrigin { createJavaProcessBuilder( "-XX:+UseConcMarkSweepGC", // this will cause UseParNewGC to be FLAG_SET_ERGO "-XX:+PrintGCDetails", + "-XX:+UseCerealGC", // Should be ignored. "-XX:Flags=" + flagsFile.getAbsolutePath(), "-cp", System.getProperty("test.class.path"), "CheckOrigin", "-runtests"); Map env = pb.environment(); - env.put("_JAVA_OPTIONS", "-XX:+PrintOopAddress"); + // "UseCMSGC" should be ignored. + env.put("_JAVA_OPTIONS", "-XX:+TraceExceptions -XX:+UseCMSGC"); + // "UseGOneGC" should be ignored. + env.put("JAVA_TOOL_OPTIONS", "-XX:+IgnoreUnrecognizedVMOptions " + + "-XX:+PrintVMOptions -XX:+UseGOneGC"); pb.redirectOutput(ProcessBuilder.Redirect.INHERIT); pb.redirectError(ProcessBuilder.Redirect.INHERIT); @@ -94,7 +99,10 @@ public class CheckOrigin { // Set on the command line checkOrigin("PrintGCDetails", Origin.VM_CREATION); // Set in _JAVA_OPTIONS - checkOrigin("PrintOopAddress", Origin.ENVIRON_VAR); + checkOrigin("TraceExceptions", Origin.ENVIRON_VAR); + // Set in JAVA_TOOL_OPTIONS + checkOrigin("IgnoreUnrecognizedVMOptions", Origin.ENVIRON_VAR); + checkOrigin("PrintVMOptions", Origin.ENVIRON_VAR); // Set in -XX:Flags file checkOrigin("PrintSafepointStatistics", Origin.CONFIG_FILE); // Set through j.l.m