diff options
| author | Arnaud Simon <arnaudsimon@apache.org> | 2008-04-02 13:03:39 +0000 |
|---|---|---|
| committer | Arnaud Simon <arnaudsimon@apache.org> | 2008-04-02 13:03:39 +0000 |
| commit | 12a2d33408473cdd53810a2619830a6bfa705ffe (patch) | |
| tree | 16625b8984a90e12e3665c3fba2a0126246b240a /qpid/java/module.xml | |
| parent | 0659b91d48073a2fa28335412bf026c88191ade5 (diff) | |
| download | qpid-python-12a2d33408473cdd53810a2619830a6bfa705ffe.tar.gz | |
QPID-884 Updated ant for using a profile. I have created a default profile that runs the tests against an 0.8 in VM broker and cpp-async and cpp-sync that respectively runs the test against an 0.10 cpp broker with async store and with sync store.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@643894 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
| -rw-r--r-- | qpid/java/module.xml | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml index 670992bff1..7374b9af09 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -157,42 +157,23 @@ </copy> </target> - <property name="test" value="*Test"/> - <property name="test.fork" value="no"/> - <property name="test.mem" value="512M"/> - - <property name="log" value="info"/> - <property name="amqj.logging.level" value="${log}"/> - <property name="root.logging.level" value="${log}"/> - <property name="log4j.configuration" value="file://${project.root}/log4j-test.xml"/> - <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/> - <property name="java.naming.provider.url" value="${project.root}/test-provider.properties"/> - - <condition property="brokerdefault" value="${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t" else="vm"> - <isset property="cpp"/> - </condition> - - <condition property="broker" value="${brokerdefault} --load-module ${store} --store-async yes" else="${brokerdefault}"> - <and> - <isset property="store"/> - <isset property="cpp"/> - </and> + + <condition property="config" value="${profile}.testprofile" else="default.testprofile"> + <and> + <isset property="profile"/> + <available file="${project.root}/${profile}.testprofile" type="file"/> + </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"/> - </condition> + <property file="${project.root}/${config}"/> <target name="test" depends="compile-tests" if="module.test.src.exists" description="execute unit tests"> + <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no" haltonfailure="no" printsummary="on" timeout="600000" > - + <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/> <sysproperty key="root.logging.level" value="${root.logging.level}"/> <sysproperty key="log4j.configuration" value="${log4j.configuration}"/> @@ -201,6 +182,8 @@ <sysproperty key="broker" value="${broker}"/> <sysproperty key="broker.clean" value="${broker.clean}"/> <sysproperty key="broker.version" value="${broker.version}"/> + <sysproperty key="test.excludes" value="${test.excludes}"/> + <sysproperty key="test.excludesfile" value="${test.excludesfile}"/> <formatter type="plain"/> <formatter type="xml"/> @@ -209,7 +192,8 @@ <batchtest fork="${test.fork}" todir="${build.results}"> <fileset dir="${module.test.src}"> - <include name="**/${test}.java"/> + <include name="**/${test1}.java"/> + <include name="**/${test}.java"/> </fileset> </batchtest> </junit> @@ -220,7 +204,7 @@ <fileset dir="${module.bin}"/> </copy> <chmod dir="${build.bin}" perm="ugo+rx" includes="**/*"/> - <copy todir="${build.etc}" failonerror="false"> + <copy todir="${build.etc}" failonerror="false"> <fileset dir="${module.etc}"/> </copy> </target> |