110 TestMaxHeapSizeTools.checkGenMaxHeapSize(gcflag, 4); |
110 TestMaxHeapSizeTools.checkGenMaxHeapSize(gcflag, 4); |
111 TestMaxHeapSizeTools.checkGenMaxHeapSize(gcflag, 5); |
111 TestMaxHeapSizeTools.checkGenMaxHeapSize(gcflag, 5); |
112 } |
112 } |
113 |
113 |
114 private static void checkInvalidMinInitialHeapCombinations(String gcflag) throws Exception { |
114 private static void checkInvalidMinInitialHeapCombinations(String gcflag) throws Exception { |
|
115 expectError(new String[] { gcflag, "-XX:InitialHeapSize=1023K", "-version" }); |
115 expectError(new String[] { gcflag, "-Xms64M", "-XX:InitialHeapSize=32M", "-version" }); |
116 expectError(new String[] { gcflag, "-Xms64M", "-XX:InitialHeapSize=32M", "-version" }); |
116 } |
117 } |
117 |
118 |
118 private static void checkValidMinInitialHeapCombinations(String gcflag) throws Exception { |
119 private static void checkValidMinInitialHeapCombinations(String gcflag) throws Exception { |
|
120 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=1024K", "-version" }); |
119 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms4M", "-version" }); |
121 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms4M", "-version" }); |
120 expectValid(new String[] { gcflag, "-Xms4M", "-XX:InitialHeapSize=8M", "-version" }); |
122 expectValid(new String[] { gcflag, "-Xms4M", "-XX:InitialHeapSize=8M", "-version" }); |
121 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms8M", "-version" }); |
123 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms8M", "-version" }); |
122 // the following is not an error as -Xms sets both minimal and initial heap size |
124 // the following is not an error as -Xms sets both minimal and initial heap size |
123 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=4M", "-Xms8M", "-version" }); |
125 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=4M", "-Xms8M", "-version" }); |
124 } |
126 } |
125 |
127 |
126 private static void checkInvalidInitialMaxHeapCombinations(String gcflag) throws Exception { |
128 private static void checkInvalidInitialMaxHeapCombinations(String gcflag) throws Exception { |
|
129 expectError(new String[] { gcflag, "-XX:MaxHeapSize=2047K", "-version" }); |
127 expectError(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=8M", "-version" }); |
130 expectError(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=8M", "-version" }); |
128 expectError(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-XX:MaxHeapSize=4M", "-version" }); |
131 expectError(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-XX:MaxHeapSize=4M", "-version" }); |
129 } |
132 } |
130 |
133 |
131 private static void checkValidInitialMaxHeapCombinations(String gcflag) throws Exception { |
134 private static void checkValidInitialMaxHeapCombinations(String gcflag) throws Exception { |
|
135 expectValid(new String[] { gcflag, "-XX:MaxHeapSize=2048K", "-version" }); |
132 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=4M", "-XX:MaxHeapSize=8M", "-version" }); |
136 expectValid(new String[] { gcflag, "-XX:InitialHeapSize=4M", "-XX:MaxHeapSize=8M", "-version" }); |
133 expectValid(new String[] { gcflag, "-XX:MaxHeapSize=8M", "-XX:InitialHeapSize=4M", "-version" }); |
137 expectValid(new String[] { gcflag, "-XX:MaxHeapSize=8M", "-XX:InitialHeapSize=4M", "-version" }); |
134 expectValid(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=4M", "-version" }); |
138 expectValid(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=4M", "-version" }); |
135 // a value of "0" for initial heap size means auto-detect |
139 // a value of "0" for initial heap size means auto-detect |
136 expectValid(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=0M", "-version" }); |
140 expectValid(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=0M", "-version" }); |