test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 69,79 ****
                      "CheckOrigin",
                      "-runtests");
  
              Map<String, String> env = pb.environment();
              // "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);
--- 69,79 ----
                      "CheckOrigin",
                      "-runtests");
  
              Map<String, String> env = pb.environment();
              // "UseCMSGC" should be ignored.
!             env.put("_JAVA_OPTIONS", "-XX:+CheckJNICalls -XX:+UseCMSGC");
              // "UseGOneGC" should be ignored.
              env.put("JAVA_TOOL_OPTIONS", "-XX:+IgnoreUnrecognizedVMOptions "
                  + "-XX:+PrintVMOptions -XX:+UseGOneGC");
  
              pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
*** 97,107 ****
              // Not set, so should be default
              checkOrigin("ManagementServer", Origin.DEFAULT);
              // Set on the command line
              checkOrigin("UseCodeAging", Origin.VM_CREATION);
              // Set in _JAVA_OPTIONS
!             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);
--- 97,107 ----
              // Not set, so should be default
              checkOrigin("ManagementServer", Origin.DEFAULT);
              // Set on the command line
              checkOrigin("UseCodeAging", Origin.VM_CREATION);
              // Set in _JAVA_OPTIONS
!             checkOrigin("CheckJNICalls", 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);