OpenJDK / amber / amber
changeset 57242:978b2201984c
8226302: Test failures on IBM platforms (power and s/390) after JDK-8223837
Summary: Adjust heap size values for 32M heap aligment (page size 64k)
Reviewed-by: goetz, rschmelter, tschatzl
| author | mdoerr |
|---|---|
| date | Mon, 08 Jul 2019 10:56:05 +0200 |
| parents | 3eae7f0e21d6 |
| children | 3595fb8794c5 |
| files | test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java Sun Jul 07 18:27:38 2019 -0700 +++ b/test/hotspot/jtreg/gc/arguments/TestMaxHeapSizeTools.java Mon Jul 08 10:56:05 2019 +0200 @@ -135,7 +135,8 @@ expectError(new String[] { gcflag, "-XX:InitialHeapSize=1023K", "-version" }); expectError(new String[] { gcflag, "-Xms64M", "-XX:InitialHeapSize=32M", "-version" }); expectError(new String[] { gcflag, "-XX:MinHeapSize=1023K", "-version" }); - expectError(new String[] { gcflag, "-Xms4M", "-XX:MinHeapSize=8M", "-version" }); + // Note: MinHeapSize values get aligned up by HeapAlignment which is 32M with 64k pages. + expectError(new String[] { gcflag, "-Xms4M", "-XX:MinHeapSize=64M", "-version" }); expectError(new String[] { gcflag, "-XX:MinHeapSize=8M -XX:InitialHeapSize=4m" }); }
--- a/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java Sun Jul 07 18:27:38 2019 -0700 +++ b/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java Mon Jul 08 10:56:05 2019 +0200 @@ -35,8 +35,9 @@ import jdk.test.lib.process.ProcessTools; public class TestSoftMaxHeapSizeFlag { - private static final long Xms = 200 * 1024 * 1024; - private static final long Xmx = 300 * 1024 * 1024; + // Note: Xms and Xmx values get aligned up by HeapAlignment which is 32M with 64k pages. + private static final long Xms = 224 * 1024 * 1024; + private static final long Xmx = 320 * 1024 * 1024; private static final long greaterThanXmx = Xmx + 1; private static final long betweenXmsAndXmx = (Xms + Xmx) / 2;