diff options
| -rw-r--r-- | qpid/java/010ExcludeList | 9 | ||||
| -rw-r--r-- | qpid/java/010ExcludeList-store | 10 | ||||
| -rw-r--r-- | qpid/java/cpp.async.testprofile | 4 | ||||
| -rw-r--r-- | qpid/java/cpp.sync.testprofile | 6 | ||||
| -rw-r--r-- | qpid/java/cpp.testprofile | 17 | ||||
| -rw-r--r-- | qpid/java/default.testprofile | 2 |
6 files changed, 40 insertions, 8 deletions
diff --git a/qpid/java/010ExcludeList b/qpid/java/010ExcludeList index 709c846068..acdd19b02e 100644 --- a/qpid/java/010ExcludeList +++ b/qpid/java/010ExcludeList @@ -3,8 +3,13 @@ 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 // those tests need durable subscribe states to be persisted org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent -org.apache.qpid.test.unit.ct.DurableSubscriberTests#testDurSubRestoresMessageSelector
\ No newline at end of file +// those tests require broker recovery +org.apache.qpid.test.unit.ct.DurableSubscriberTests#* +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/qpid/java/010ExcludeList-store b/qpid/java/010ExcludeList-store new file mode 100644 index 0000000000..709c846068 --- /dev/null +++ b/qpid/java/010ExcludeList-store @@ -0,0 +1,10 @@ +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 +// those tests need durable subscribe states to be persisted +org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent +org.apache.qpid.test.unit.ct.DurableSubscriberTests#testDurSubRestoresMessageSelector
\ No newline at end of file diff --git a/qpid/java/cpp.async.testprofile b/qpid/java/cpp.async.testprofile index 3dd78c855e..52f1db6d41 100644 --- a/qpid/java/cpp.async.testprofile +++ b/qpid/java/cpp.async.testprofile @@ -1,10 +1,10 @@ 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=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --store-async yes --auth no broker.clean=${project.root}/clean-dir ${build.data} java.naming.provider.url=${project.root}/test-provider.properties max_prefetch=1000 test.excludes=true -test.excludesfile=${project.root}/010ExcludeList +test.excludesfile=${project.root}/010ExcludeList-store log=info amqj.logging.level=$log root.logging.level=$log diff --git a/qpid/java/cpp.sync.testprofile b/qpid/java/cpp.sync.testprofile index 44a2d71ea0..75eff23622 100644 --- a/qpid/java/cpp.sync.testprofile +++ b/qpid/java/cpp.sync.testprofile @@ -1,10 +1,10 @@ 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} +broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --store-async no --auth no +broker.clean=${project.root}/clean-dir ${build.data} java.naming.provider.url=${project.root}/test-provider.properties test.excludes=true max_prefetch=1000 -test.excludesfile=${project.root}/010ExcludeList +test.excludesfile=${project.root}/010ExcludeList-store log=info amqj.logging.level=$log root.logging.level=$log diff --git a/qpid/java/cpp.testprofile b/qpid/java/cpp.testprofile new file mode 100644 index 0000000000..1613746888 --- /dev/null +++ b/qpid/java/cpp.testprofile @@ -0,0 +1,17 @@ +broker.version=0-10 +broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --auth no +broker.clean=${project.root}/clean-dir ${build.data} +java.naming.provider.url=${project.root}/test-provider.properties +max_prefetch=1000 +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 +haltonfailure=no +haltonerror=no diff --git a/qpid/java/default.testprofile b/qpid/java/default.testprofile index 08c9f08dc6..d21ef9af71 100644 --- a/qpid/java/default.testprofile +++ b/qpid/java/default.testprofile @@ -1,6 +1,6 @@ broker.version=0-8 broker=vm -broker.clean=${project.root}/clean-dir +broker.clean=${project.root}/clean-dir ${build.data} java.naming.provider.url=${project.root}/test-provider.properties test.excludes=true test.excludesfile=${project.root}/08ExcludeList |