CheckOrigin.java (11884:b45c81ca8671) CheckOrigin.java (12470:05e214201706)
1/*
2 * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation.
8 *

--- 49 unchanged lines hidden (view full) ---

58 new PrintWriter(new FileWriter(flagsFile))) {
59 pw.println("+PrintSafepointStatistics");
60 }
61
62 ProcessBuilder pb = ProcessTools.
63 createJavaProcessBuilder(
64 "-XX:+UseConcMarkSweepGC", // this will cause UseParNewGC to be FLAG_SET_ERGO
65 "-XX:+PrintGCDetails",
1/*
2 * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation.
8 *

--- 49 unchanged lines hidden (view full) ---

58 new PrintWriter(new FileWriter(flagsFile))) {
59 pw.println("+PrintSafepointStatistics");
60 }
61
62 ProcessBuilder pb = ProcessTools.
63 createJavaProcessBuilder(
64 "-XX:+UseConcMarkSweepGC", // this will cause UseParNewGC to be FLAG_SET_ERGO
65 "-XX:+PrintGCDetails",
66 "-XX:+UseCerealGC", // Should be ignored.
66 "-XX:Flags=" + flagsFile.getAbsolutePath(),
67 "-cp", System.getProperty("test.class.path"),
68 "CheckOrigin",
69 "-runtests");
70
71 Map<String, String> env = pb.environment();
67 "-XX:Flags=" + flagsFile.getAbsolutePath(),
68 "-cp", System.getProperty("test.class.path"),
69 "CheckOrigin",
70 "-runtests");
71
72 Map<String, String> env = pb.environment();
72 env.put("_JAVA_OPTIONS", "-XX:+PrintOopAddress");
73 // "UseCMSGC" should be ignored.
74 env.put("_JAVA_OPTIONS", "-XX:+TraceExceptions -XX:+UseCMSGC");
75 // "UseGOneGC" should be ignored.
76 env.put("JAVA_TOOL_OPTIONS", "-XX:+IgnoreUnrecognizedVMOptions "
77 + "-XX:+PrintVMOptions -XX:+UseGOneGC");
73
74 pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
75 pb.redirectError(ProcessBuilder.Redirect.INHERIT);
76 Process p = pb.start();
77 int exit = p.waitFor();
78 System.out.println("sub process exit == " + exit);
79 if (exit != 0) {
80 throw new Exception("Unexpected exit code from subprocess == " + exit);

--- 8 unchanged lines hidden (view full) ---

89
90 // check the origin field for all the options we set
91
92 // Not set, so should be default
93 checkOrigin("ManagementServer", Origin.DEFAULT);
94 // Set on the command line
95 checkOrigin("PrintGCDetails", Origin.VM_CREATION);
96 // Set in _JAVA_OPTIONS
78
79 pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
80 pb.redirectError(ProcessBuilder.Redirect.INHERIT);
81 Process p = pb.start();
82 int exit = p.waitFor();
83 System.out.println("sub process exit == " + exit);
84 if (exit != 0) {
85 throw new Exception("Unexpected exit code from subprocess == " + exit);

--- 8 unchanged lines hidden (view full) ---

94
95 // check the origin field for all the options we set
96
97 // Not set, so should be default
98 checkOrigin("ManagementServer", Origin.DEFAULT);
99 // Set on the command line
100 checkOrigin("PrintGCDetails", Origin.VM_CREATION);
101 // Set in _JAVA_OPTIONS
97 checkOrigin("PrintOopAddress", Origin.ENVIRON_VAR);
102 checkOrigin("TraceExceptions", Origin.ENVIRON_VAR);
103 // Set in JAVA_TOOL_OPTIONS
104 checkOrigin("IgnoreUnrecognizedVMOptions", Origin.ENVIRON_VAR);
105 checkOrigin("PrintVMOptions", Origin.ENVIRON_VAR);
98 // Set in -XX:Flags file
99 checkOrigin("PrintSafepointStatistics", Origin.CONFIG_FILE);
100 // Set through j.l.m
101 checkOrigin("HeapDumpOnOutOfMemoryError", Origin.MANAGEMENT);
102 // Should be set by the VM, when we set UseConcMarkSweepGC
103 checkOrigin("UseParNewGC", Origin.ERGONOMIC);
104 // Set using attach
105 checkOrigin("HeapDumpPath", Origin.ATTACH_ON_DEMAND);

--- 37 unchanged lines hidden --- 		106 // Set in -XX:Flags file
107 checkOrigin("PrintSafepointStatistics", Origin.CONFIG_FILE);
108 // Set through j.l.m
109 checkOrigin("HeapDumpOnOutOfMemoryError", Origin.MANAGEMENT);
110 // Should be set by the VM, when we set UseConcMarkSweepGC
111 checkOrigin("UseParNewGC", Origin.ERGONOMIC);
112 // Set using attach
113 checkOrigin("HeapDumpPath", Origin.ATTACH_ON_DEMAND);

--- 37 unchanged lines hidden ---