From e9c7cc446e8887353ec07610a06c1ebc9c33630a Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Wed, 5 Feb 2025 08:37:13 +0000
Subject: [PATCH] Refactor unit test memory limit so it is unset by default

A fixed limit didn't work for all use cases. This approach restores the
previous default and allows developers to configure their own if
required.
---
 build.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index b0ad36272f53..fe4624313b63 100644
--- a/build.xml
+++ b/build.xml
@@ -2027,6 +2027,8 @@
   <condition property="opens.javautilconcurrent" value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" else="-Dtest14=1">
     <javaversion atleast="9"/>
   </condition>
+  <!-- Set memory properties (unset by default) -->
+  <property name="test.xmx" value="-Dnoop"/>
 
   <macrodef name="runtests"
             description="Runs the unit tests using the specified connector.
@@ -2046,11 +2048,11 @@
           errorproperty="test.result.error"
           failureproperty="test.result.failure"
           haltonfailure="${test.haltonfailure}"
-          threads="${test.threads}"
-          maxmemory="256m">
+          threads="${test.threads}">
 
           <jvmarg value="${test.jvmarg.egd}"/>
           <jvmarg value="-Dfile.encoding=UTF-8"/>
+          <jvmarg value="${test.xmx}"/>
           <jvmarg value="-Djava.library.path=${test.apr.loc}"/>
           <jvmarg value="${test.formatter}"/>
           <jvmarg value="-Djava.net.preferIPv4Stack=${java.net.preferIPv4Stack}"/>