test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java

@@ -32,10 +32,11 @@
 import jdk.test.lib.management.DynamicVMOption;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.dcmd.CommandExecutor;
 import jdk.test.lib.dcmd.JMXExecutor;
+import jdk.test.lib.Platform;
 import sun.tools.attach.HotSpotVirtualMachine;
 
 import static optionsvalidation.JVMOptionsUtils.failedMessage;
 import static optionsvalidation.JVMOptionsUtils.GCType;
 import static optionsvalidation.JVMOptionsUtils.printOutputContent;

@@ -382,10 +383,21 @@
 
         if (VMType != null) {
             runJava.add(VMType);
         }
 
+        // Run with a small heap to avoid excessive execution time
+        long max = Runtime.getRuntime().maxMemory() / 1024 / 1024;
+        if (max > 1024) {
+          runJava.add("-Xmx1024m");
+        }
+
+        if (Platform.isDebugBuild()) {
+          // Avoid excessive execution time.
+          runJava.add("-XX:-ZapUnusedHeapArea");
+        }
+
         if (GCType != null &&
             !(prepend.contains("-XX:+UseConcMarkSweepGC") ||
               prepend.contains("-XX:+UseSerialGC") ||
               prepend.contains("-XX:+UseParallelGC") ||
               prepend.contains("-XX:+UseG1GC"))) {