diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-06-23 13:46:42 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-06-23 13:46:42 +0000 |
| commit | f9c0598d3e3c7fe1a923e927524d2a0377477b82 (patch) | |
| tree | 77a16044d164a509bd9c5e0029719e06b1f16ce1 /qpid/java/module.xml | |
| parent | b4dcf79489661a2713c702b16ec8e9acc45e7d04 (diff) | |
| download | qpid-python-f9c0598d3e3c7fe1a923e927524d2a0377477b82.tar.gz | |
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@957202 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
| -rw-r--r-- | qpid/java/module.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml index f89a1a21ae..7ead75e64a 100644 --- a/qpid/java/module.xml +++ b/qpid/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> |