From 3e60ce316b62d1f2f7fe2d62b6fb475becf71ed5 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 23 Jun 2010 13:46:42 +0000
Subject: QPID-2635: Add fork once to junit ant task

Applied patch from Andrew Kennedy <andrew.international@gmail.com>


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

(limited to 'java')

diff --git a/java/module.xml b/java/module.xml
index f89a1a21ae..7ead75e64a 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -289,17 +289,18 @@
          <contains substring="${module.name}" string="${exclude.modules}" />
   </condition>
 
+  <property name="jvm.args" value=""/>
   <target name="test" depends="build,compile-tests" if="module.test.src.exists"
          unless="${dontruntest}" description="execute unit tests">
 
     <delete file="${module.failed}"/>
 
     <echo message="Using profile:${profile}" level="info"/>
-    <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
+    <junit fork="yes" forkmode="once" maxmemory="${test.mem}" reloading="no"
            haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
-           failureproperty="test.failures" printsummary="on" timeout="600000" >
+           failureproperty="test.failures" printsummary="on" timeout="6000000" >
 
-      <jvmarg value="${jvm.args}"/>
+      <jvmarg line="${jvm.args}" />
 
       <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
       <sysproperty key="amqj.server.logging.level" value="${amqj.server.logging.level}"/>
@@ -346,7 +347,7 @@
 
       <classpath refid="module.test.path"/>
 
-      <batchtest fork="${test.fork}" todir="${module.results}">
+      <batchtest todir="${module.results}">
         <fileset dir="${module.test.src}" excludes="${module.test.excludes}">
           <include name="**/${test}.java"/>
         </fileset>
-- 
cgit v1.2.1