8226302: Test failures on IBM platforms (power and s/390) after JDK-8223837

Adjust heap size values for 32M heap aligment (page size 64k)

Reviewed-by: goetz, rschmelter, tschatzl
This commit is contained in:
Martin Doerr 2019-07-08 10:56:05 +02:00
parent 291dfa4da5
commit 516578513c
2 changed files with 5 additions and 3 deletions

@ -135,7 +135,8 @@ class TestMaxHeapSizeTools {
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" });
}

@ -35,8 +35,9 @@ package gc.arguments;
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;