From 0caedb0d019268f67c1d67972c9f2b74ea65dfaf Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Thu, 28 Feb 2008 17:04:28 +0000
Subject: added an option to control junit forking of tests, and defaulted it
 to off

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@632057 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/module.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'qpid/java/module.xml')

diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index b5f2efdf01..a9832e32dd 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -158,6 +158,7 @@
   </target>
 
   <property name="test" value="*Test"/>
+  <property name="test.fork" value="no"/>
   <property name="test.mem" value="512M"/>
 
   <property name="log" value="info"/>
@@ -189,9 +190,7 @@
 
   <target name="test" depends="compile-tests" if="module.test.src.exists"
           description="execute unit tests">
-    <junit fork="yes" haltonfailure="no" printsummary="on" timeout="600000">
-
-      <jvmarg value="-Xmx${test.mem}" />
+    <junit fork="${test.fork}" maxmemory="${test.mem}" haltonfailure="no" printsummary="on" timeout="600000">
 
       <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
       <sysproperty key="root.logging.level" value="${root.logging.level}"/>
@@ -207,7 +206,7 @@
 
       <classpath refid="module.test.path"/>
 
-      <batchtest fork="yes" todir="${build.results}">
+      <batchtest fork="${test.fork}" todir="${build.results}">
         <fileset dir="${module.test.src}">
           <include name="**/${test}.java"/>
         </fileset>
-- 
cgit v1.2.1