8247751: Shenandoah: options tests should run with smaller heaps
Reviewed-by: zgu, rkennke
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java b/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java
index 130271c..5f38b5e 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java
@@ -46,7 +46,9 @@
private static void testHeuristics() throws Exception {
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahGCHeuristics=aggressive",
@@ -55,7 +57,9 @@
output.shouldHaveExitValue(0);
}
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahGCHeuristics=static",
@@ -64,7 +68,9 @@
output.shouldHaveExitValue(0);
}
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahGCHeuristics=fluff",
@@ -77,7 +83,9 @@
private static void testRange(String option, int min, int max) throws Exception {
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + (max + 1),
@@ -86,7 +94,9 @@
output.shouldHaveExitValue(1);
}
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + max,
@@ -95,7 +105,9 @@
output.shouldHaveExitValue(0);
}
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + (min - 1),
@@ -104,7 +116,9 @@
output.shouldHaveExitValue(1);
}
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:" + option + "=" + min,
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java b/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java
index 110af7d..dd270e7 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java
@@ -39,9 +39,10 @@
public class TestClassUnloadingArguments {
public static void testWith(String msg, boolean cu, boolean cuConc, String... args) throws Exception {
- String[] cmds = Arrays.copyOf(args, args.length + 2);
- cmds[args.length] = "-XX:+PrintFlagsFinal";
- cmds[args.length + 1] = "-version";
+ String[] cmds = Arrays.copyOf(args, args.length + 3);
+ cmds[args.length] = "-Xmx128m";
+ cmds[args.length + 1] = "-XX:+PrintFlagsFinal";
+ cmds[args.length + 2] = "-version";
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(cmds);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java
index 279d399..122fa86 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java
@@ -61,6 +61,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@@ -77,6 +78,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@@ -94,6 +96,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@@ -111,6 +114,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
@@ -128,6 +132,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java
index a4201ae..68d1807 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java
@@ -61,6 +61,7 @@
for (String opt : opts) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-Xlog:gc",
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java b/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java
index c8eda3b..fe2874f 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java
@@ -53,6 +53,7 @@
private static void testWith(String h, Mode mode) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@@ -73,6 +74,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@@ -93,6 +95,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java b/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java
index 7915d0b..c370f39 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java
@@ -38,7 +38,9 @@
public class TestHumongousThresholdArgs {
public static void main(String[] args) throws Exception {
{
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
@@ -49,7 +51,9 @@
int[] invalid = new int[] {-100, -1, 0, 101, 1000};
for (int v : valid) {
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahHumongousThreshold=" + v,
"-version");
@@ -58,7 +62,9 @@
}
for (int v : invalid) {
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ShenandoahHumongousThreshold=" + v,
"-version");
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java b/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java
index b0b14ce..8dd6db6 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java
@@ -40,9 +40,10 @@
public class TestLoopMiningArguments {
public static void testWith(String msg, boolean cls, int iters, String... args) throws Exception {
- String[] cmds = Arrays.copyOf(args, args.length + 2);
- cmds[args.length] = "-XX:+PrintFlagsFinal";
- cmds[args.length + 1] = "-version";
+ String[] cmds = Arrays.copyOf(args, args.length + 3);
+ cmds[args.length] = "-Xmx128m";
+ cmds[args.length + 1] = "-XX:+PrintFlagsFinal";
+ cmds[args.length + 2] = "-version";
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(cmds);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
index 9dc4b06..de5f860 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
@@ -52,6 +52,7 @@
private static void testWith(String h, Mode mode) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@@ -72,6 +73,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:-UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@@ -92,6 +94,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:-UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java
index eb45b8e..60debf0 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java
@@ -45,7 +45,9 @@
}
private static void testWith(int conc, int par) throws Exception {
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
+ "-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
"-XX:ConcGCThreads=" + conc,
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java
index 07b418e..f784d05 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java
@@ -39,6 +39,7 @@
public static void main(String[] args) throws Exception {
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@@ -53,6 +54,7 @@
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
index 7217c20..dea0b11 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
@@ -62,6 +62,7 @@
private static void shouldFailAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@@ -79,6 +80,7 @@
private static void shouldPassAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java
index bc948b1..bb6f39b 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java
@@ -56,6 +56,7 @@
private static void shouldFailAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
@@ -73,6 +74,7 @@
private static void shouldPassAll(String h, String[] barriers) throws Exception {
for (String b : barriers) {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+UseShenandoahGC",
