diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2008-02-21 20:51:11 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2008-02-21 20:51:11 +0000 |
| commit | 7e83529e9cef60441fa9cd297ffce485e57b3fc2 (patch) | |
| tree | 79bb4c7f889ee0204d9f433f089790f469b32ec4 /qpid/java/module.xml | |
| parent | f054d72c87c3646042c2d4ee91a44fe30523594e (diff) | |
| download | qpid-python-7e83529e9cef60441fa9cd297ffce485e57b3fc2.tar.gz | |
modified test harness to clean up data dir when broker crashes
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@629986 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
| -rw-r--r-- | qpid/java/module.xml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml index c129c2ea7a..1da06ab92b 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -169,14 +169,18 @@ <condition property="brokerdefault" value="${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t" else="vm"> <isset property="cpp"/> - </condition> + </condition> - <condition property="broker" value="${brokerdefault} --load-module ${store}" else="${brokerdefault}"> + <condition property="broker" value="${brokerdefault} --load-module ${store} --store-async yes" else="${brokerdefault}"> <and> - <isset property="store"/> - <isset property="cpp"/> - </and> - </condition> + <isset property="store"/> + <isset property="cpp"/> + </and> + </condition> + + <condition property="broker.clean" value="${project.root}/clean-dir ${build.data}"> + <isset property="cpp"/> + </condition> <condition property="broker.version" value="0-10" else="0-8"> <isset property="cpp"/> @@ -184,7 +188,6 @@ <target name="test" depends="compile-tests" if="module.test.src.exists" description="execute unit tests"> - <echo message="=------->>>>>>>>>>>>> ${broker}"/> <junit fork="yes" haltonfailure="no" printsummary="on" timeout="600000"> <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/> @@ -193,6 +196,7 @@ <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/> <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/> <sysproperty key="broker" value="${broker}"/> + <sysproperty key="broker.clean" value="${broker.clean}"/> <sysproperty key="broker.version" value="${broker.version}"/> <formatter type="plain"/> |