diff options
Diffstat (limited to 'java')
19 files changed, 20 insertions, 28 deletions
diff --git a/java/module.xml b/java/module.xml index 9bf0270bd6..f31a52f0ff 100644 --- a/java/module.xml +++ b/java/module.xml @@ -239,6 +239,10 @@ </concat> <property file="${build.scratch}/test-${profile}.properties"/> + <map property="test.excludefiles" value="${test.excludes}"> + <globmapper from="*" to="${test.profiles}/*"/> + </map> + <condition property="dontruntest" value="dontruntest" else="runtest"> <contains substring="${module.name}" string="${exclude.modules}" /> @@ -535,9 +539,10 @@ <sysproperty key="broker.clean" value="${broker.clean}"/> <sysproperty key="broker.version" value="${broker.version}"/> <sysproperty key="broker.ready" value="${broker.ready}" /> - <sysproperty key="test.excludes" value="${test.excludes}"/> - <sysproperty key="test.excludesfile" value="${test.excludesfile}"/> <sysproperty key="test.output" value="${module.results}"/> + <syspropertyset> + <propertyref prefix="test"/> + </syspropertyset> <sysproperty key="max_prefetch" value ="${max_prefetch}"/> <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/> <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/> diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 735aa4b1de..91732bc010 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -77,11 +77,11 @@ public class QpidTestCase extends TestCase static { - if (Boolean.getBoolean("test.excludes")) + if (Boolean.getBoolean("test.exclude")) { _logger.info("Some tests should be excluded, building the exclude list"); - String exclusionListURIs = System.getProperties().getProperty("test.excludesfile", ""); - String exclusionListString = System.getProperties().getProperty("test.excludeslist", ""); + String exclusionListURIs = System.getProperties().getProperty("test.excludefiles", ""); + String exclusionListString = System.getProperties().getProperty("test.excludelist", ""); List<String> exclusionList = new ArrayList<String>(); for (String uri : exclusionListURIs.split("\\s+")) diff --git a/java/test-profiles/010ExcludeList b/java/test-profiles/010Excludes index 69077a97c8..69077a97c8 100644 --- a/java/test-profiles/010ExcludeList +++ b/java/test-profiles/010Excludes diff --git a/java/test-profiles/cpp.async.excludes b/java/test-profiles/010PrefetchExcludes index 6b0014b917..6b0014b917 100644 --- a/java/test-profiles/cpp.async.excludes +++ b/java/test-profiles/010PrefetchExcludes diff --git a/java/test-profiles/cpp.noprefetch.excludes b/java/test-profiles/010TransientExcludes index 90b4251807..90b4251807 100644 --- a/java/test-profiles/cpp.noprefetch.excludes +++ b/java/test-profiles/010TransientExcludes diff --git a/java/test-profiles/08ExcludeList b/java/test-profiles/08Excludes index 0866694854..0866694854 100644 --- a/java/test-profiles/08ExcludeList +++ b/java/test-profiles/08Excludes diff --git a/java/test-profiles/08ExcludeList-nonvm b/java/test-profiles/08StandaloneExcludes index e697201bfd..e697201bfd 100644 --- a/java/test-profiles/08ExcludeList-nonvm +++ b/java/test-profiles/08StandaloneExcludes diff --git a/java/test-profiles/08ExcludeList-nopersistence b/java/test-profiles/08TransientExcludes index f81e9c213c..f81e9c213c 100644 --- a/java/test-profiles/08ExcludeList-nopersistence +++ b/java/test-profiles/08TransientExcludes diff --git a/java/test-profiles/ExcludeList b/java/test-profiles/Excludes index a3a61b51db..a3a61b51db 100644 --- a/java/test-profiles/ExcludeList +++ b/java/test-profiles/Excludes diff --git a/java/test-profiles/XAExcludeList b/java/test-profiles/XAExcludes index 1bb26c5f27..1bb26c5f27 100644 --- a/java/test-profiles/XAExcludeList +++ b/java/test-profiles/XAExcludes diff --git a/java/test-profiles/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile index d95b1237fa..f06b56fbad 100644 --- a/java/test-profiles/cpp.async.testprofile +++ b/java/test-profiles/cpp.async.testprofile @@ -1,2 +1,3 @@ include=cpp +profile.excludes=010PrefetchExcludes broker.modules=--load-module ${broker.module.store} diff --git a/java/test-profiles/cpp.cluster.testprofile b/java/test-profiles/cpp.cluster.testprofile index b241bd4f8b..143e0d88d0 100644 --- a/java/test-profiles/cpp.cluster.testprofile +++ b/java/test-profiles/cpp.cluster.testprofile @@ -2,7 +2,7 @@ include=cpp broker.modules=--load-module ${broker.module.cluster} --cluster-name cpp-java-test-cluster -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/XAExcludeList +profile.excludes=XAExcludes 010PrefetchExcludes 010TransientExcludes profile.clustered=true profile.failoverMsgCount=10 diff --git a/java/test-profiles/cpp.excludes b/java/test-profiles/cpp.excludes deleted file mode 100644 index 65ce051481..0000000000 --- a/java/test-profiles/cpp.excludes +++ /dev/null @@ -1,15 +0,0 @@ -// 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#testMigrateDurableSubscriber - -// those tests need durable subscribe states to be persisted -org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent - -// those tests require broker recovery -org.apache.qpid.test.unit.ct.DurableSubscriberTest#* -org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash -org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash -org.apache.qpid.test.unit.xa.TopicTest#testRecover -org.apache.qpid.test.unit.xa.QueueTest#testRecover -org.apache.qpid.test.unit.xa.QueueTest#testSendAndRecover diff --git a/java/test-profiles/cpp.noprefetch.testprofile b/java/test-profiles/cpp.noprefetch.testprofile index 4c8c827e30..b2b9bc6de3 100644 --- a/java/test-profiles/cpp.noprefetch.testprofile +++ b/java/test-profiles/cpp.noprefetch.testprofile @@ -1,3 +1,3 @@ include=cpp -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch +profile.excludes=010TransientExcludes max_prefetch=0 diff --git a/java/test-profiles/cpp.testprofile b/java/test-profiles/cpp.testprofile index 0febcdb328..1d5416fe19 100644 --- a/java/test-profiles/cpp.testprofile +++ b/java/test-profiles/cpp.testprofile @@ -14,4 +14,5 @@ broker.args= broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/${profile}.excludes +profile.excludes=010PrefetchExcludes 010TransientExcludes +test.excludes=Excludes 010Excludes ${profile}.excludes ${profile.excludes} diff --git a/java/test-profiles/default-longrunning.testprofile b/java/test-profiles/default-longrunning.testprofile deleted file mode 100644 index bf24e4f9da..0000000000 --- a/java/test-profiles/default-longrunning.testprofile +++ /dev/null @@ -1 +0,0 @@ -test.includesfile=${test.profiles}/08LongRunningList diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile index 80d2e6a8a4..5a08b79e10 100644 --- a/java/test-profiles/default.testprofile +++ b/java/test-profiles/default.testprofile @@ -20,8 +20,9 @@ test.port=15672 test.port.ssl=15671 test.port.alt=15673 -test.excludes=true -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList ${test.profiles}/08ExcludeList-nopersistence +test.exclude=true +profile.excludes=08TransientExcludes +test.excludes=Excludes XAExcludes 08Excludes ${profile}.excludes ${profile.excludes} test.fork=no test.mem=512M test=*Test diff --git a/java/test-profiles/java-derby.testprofile b/java/test-profiles/java-derby.testprofile index 1786e96712..52b63ae799 100644 --- a/java/test-profiles/java-derby.testprofile +++ b/java/test-profiles/java-derby.testprofile @@ -4,4 +4,4 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=Qpid Broker Ready broker.config=${project.root}/build/etc/config-systests-derby.xml -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm +profile.excludes=08StandaloneExcludes diff --git a/java/test-profiles/java.testprofile b/java/test-profiles/java.testprofile index d1e4c12bc1..f920124735 100644 --- a/java/test-profiles/java.testprofile +++ b/java/test-profiles/java.testprofile @@ -3,4 +3,4 @@ broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=Qpid Broker Ready -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm ${test.profiles}/08ExcludeList-nopersistence +profile.excludes=08TransientExcludes 08StandaloneExcludes |