Author: arnaudsimon
Date: Wed Apr 2 06:03:39 2008
New Revision: 643894
URL: http://svn.apache.org/viewvc?rev=643894&view=rev
Log:
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.
Added:
incubator/qpid/trunk/qpid/java/010ExcludeList
incubator/qpid/trunk/qpid/java/08ExcludeList
incubator/qpid/trunk/qpid/java/cpp.async.testprofile
incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
incubator/qpid/trunk/qpid/java/default.testprofile
Modified:
incubator/qpid/trunk/qpid/java/module.xml
Added: incubator/qpid/trunk/qpid/java/010ExcludeList
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList?rev=643894&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/010ExcludeList (added)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList Wed Apr 2 06:03:39 2008
@@ -0,0 +1,9 @@
+org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
+org.apache.qpid.client.ResetMessageListenerTest#*
+// those tests should be run with prefetch off
+org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
+org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
+org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
+org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
+// this test needs durable subscribe states to be persisted
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
\ No newline at end of file
Added: incubator/qpid/trunk/qpid/java/08ExcludeList
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/08ExcludeList?rev=643894&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/08ExcludeList (added)
+++ incubator/qpid/trunk/qpid/java/08ExcludeList Wed Apr 2 06:03:39 2008
@@ -0,0 +1,4 @@
+org.apache.qpid.test.unit.xa.QueueTest#*
+org.apache.qpid.test.unit.xa.TopicTest#*
+org.apache.qpid.test.unit.ct.DurableSubscriberTests#*
+
Added: incubator/qpid/trunk/qpid/java/cpp.async.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.async.testprofile?rev=643894&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.async.testprofile (added)
+++ incubator/qpid/trunk/qpid/java/cpp.async.testprofile Wed Apr 2 06:03:39
2008
@@ -0,0 +1,14 @@
+broker.version=0-10
+broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t
--log-output ${build.data}/broker.log --load-module
${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --store-async yes
+broker.clean=${build.data}
+java.naming.provider.url=${project.root}/test-provider.properties
+test.excludes=true
+test.excludesfile=${project.root}/010ExcludeList
+log=info
+amqj.logging.level=$log
+root.logging.level=$log
+log4j.configuration=file://${project.root}/log4j-test.xml
+test.fork=no
+test.mem=512M
+test=*Test
+test1=*Tests
Added: incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.sync.testprofile?rev=643894&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.sync.testprofile (added)
+++ incubator/qpid/trunk/qpid/java/cpp.sync.testprofile Wed Apr 2 06:03:39 2008
@@ -0,0 +1,14 @@
+broker.version=0-10
+broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t
--log-output ${build.data}/broker.log --load-module
${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --store-async no
+broker.clean=${build.data}
+java.naming.provider.url=${project.root}/test-provider.properties
+test.excludes=true
+test.excludesfile=${project.root}/010ExcludeList
+log=info
+amqj.logging.level=$log
+root.logging.level=$log
+log4j.configuration=file://${project.root}/log4j-test.xml
+test.fork=no
+test.mem=512M
+test=*Test
+test1=*Tests
Added: incubator/qpid/trunk/qpid/java/default.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/default.testprofile?rev=643894&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/default.testprofile (added)
+++ incubator/qpid/trunk/qpid/java/default.testprofile Wed Apr 2 06:03:39 2008
@@ -0,0 +1,15 @@
+broker.version=0-8
+broker=vm
+broker.clean=${project.root}/clean-dir
+java.naming.provider.url=${project.root}/test-provider.properties
+test.excludes=true
+test.excludesfile=${project.root}/08ExcludeList
+log=info
+amqj.logging.level=$log
+root.logging.level=$log
+log4j.configuration=file://${project.root}/log4j-test.xml
+test.fork=no
+test.mem=512M
+test=*Test
+test1=*Tests
+
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=643894&r1=643893&r2=643894&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Wed Apr 2 06:03:39 2008
@@ -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 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" value="${brokerdefault} --load-module ${store}
--store-async yes" else="${brokerdefault}">
- <and>
- <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"/>
- </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>
