diff --git a/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java b/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java index e880071e583..2368182f558 100644 --- a/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java +++ b/test/hotspot/jtreg/gc/arguments/TestMaxNewSize.java @@ -120,19 +120,16 @@ public class TestMaxNewSize { public static void main(String args[]) throws Exception { String gcName = args[0]; - final int M32 = 32 * 1024 * 1024; - final int M64 = 64 * 1024 * 1024; - final int M96 = 96 * 1024 * 1024; - final int M128 = 128 * 1024 * 1024; - checkMaxNewSize(new String[] { gcName, "-Xmx128M" }, M128); - checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewRatio=5" }, M128); - checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewSize=32M" }, M128); - checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:OldSize=96M" }, M128); - checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:MaxNewSize=32M" }, M32); - checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewSize=32M", "-XX:MaxNewSize=32M" }, M32); - checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewRatio=6", "-XX:MaxNewSize=32M" }, M32); - checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-Xms96M" }, M128); - checkMaxNewSize(new String[] { gcName, "-Xmx96M", "-Xms96M" }, M96); - checkMaxNewSize(new String[] { gcName, "-XX:NewSize=128M", "-XX:MaxNewSize=50M"}, M128); + final int M = 1024 * 1024; + checkMaxNewSize(new String[] { gcName, "-Xmx128M" }, 128*M); + checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewRatio=5" }, 128*M); + checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewSize=32M" }, 128*M); + checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:OldSize=96M" }, 128*M); + checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:MaxNewSize=32M" }, 32*M); + checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewSize=32M", "-XX:MaxNewSize=32M" }, 32*M); + checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-XX:NewRatio=6", "-XX:MaxNewSize=32M" }, 32*M); + checkMaxNewSize(new String[] { gcName, "-Xmx128M", "-Xms96M" }, 128*M); + checkMaxNewSize(new String[] { gcName, "-Xmx96M", "-Xms96M" }, 96*M); + checkMaxNewSize(new String[] { gcName, "-XX:NewSize=128M", "-XX:MaxNewSize=50M"}, 128*M); } }