diff options
| -rw-r--r-- | qpid/cc/config/java/cpp.noprefetch.testprofile | 2 | ||||
| -rwxr-xr-x | qpid/cc/scripts/javaconfig.sh | 1 | ||||
| -rw-r--r-- | qpid/java/010ExcludeList-noPrefetch | 55 | ||||
| -rw-r--r-- | qpid/java/cpp.noprefetch.testprofile (renamed from qpid/java/cpp.sync.testprofile) | 5 |
4 files changed, 59 insertions, 4 deletions
diff --git a/qpid/cc/config/java/cpp.noprefetch.testprofile b/qpid/cc/config/java/cpp.noprefetch.testprofile index d4176e9efd..694451e551 100644 --- a/qpid/cc/config/java/cpp.noprefetch.testprofile +++ b/qpid/cc/config/java/cpp.noprefetch.testprofile @@ -1,4 +1,4 @@ broker.version=0-10 broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module store_home/lib/.libs/libbdbstore.so --auth no --no-module-dir max_prefetch=0 -test.excludesfile=${project.root}/cppNoPrefetchExcludeList
\ No newline at end of file +test.excludesfile=${project.root}/010ExcludeList-noPrefetch
\ No newline at end of file diff --git a/qpid/cc/scripts/javaconfig.sh b/qpid/cc/scripts/javaconfig.sh index 37677cf93d..7a1a3a1a7d 100755 --- a/qpid/cc/scripts/javaconfig.sh +++ b/qpid/cc/scripts/javaconfig.sh @@ -21,7 +21,6 @@ # copy the profiles sed "s#store_home#$CPPSTORE_HOME#g" $CC_HOME/cc/config/java/cpp.noprefetch.testprofile > "$CC_HOME/java/"/cpp.noprefetch.testprofile sed "s#store_home#$CPPSTORE_HOME#g" $CC_HOME/cc/config/java/cpp.testprofile > "$CC_HOME/java"/cpp.testprofile -cp $CC_HOME/cc/config/java/*ExcludeList $CC_HOME/java/. QPID_JARS=`find "$CC_HOME/java/build/lib" -name '*.jar' | tr '\n' ":"` QPID_JARS=local.classes=$QPID_JARS sed "s#local.classes=.*#$QPID_JARS#g" $TS_HOME/bin/build.properties > "$TS_HOME/bin"/build.properties-new diff --git a/qpid/java/010ExcludeList-noPrefetch b/qpid/java/010ExcludeList-noPrefetch new file mode 100644 index 0000000000..610e31717a --- /dev/null +++ b/qpid/java/010ExcludeList-noPrefetch @@ -0,0 +1,55 @@ +org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* +org.apache.qpid.client.ResetMessageListenerTest#* +org.apache.qpid.test.unit.transacted.TransactedTest#testRollback +// those tests need durable subscribe states to be persisted +org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent +org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector +// This test cannot be run with no-prefetch +org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash +//These tests are for the java broker +org.apache.qpid.server.security.acl.SimpleACLTest#* +org.apache.qpid.server.plugins.PluginTest#* +// This test is not finished +org.apache.qpid.test.testcases.TTLTest#* +// Those tests require failover support +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser +org.apache.qpid.test.testcases.FailoverTest#* +org.apache.qpid.test.client.failover.FailoverTest#* +// Those tests are testing 0.8 specific semantics +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub +org.apache.qpid.test.client.FlowControlTest#* +org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure +// the 0.10 c++ broker does not implement forget +org.apache.qpid.test.unit.xa.FaultTest#testForget +// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation +org.apache.qpid.server.queue.PriorityTest +//this test checks explicitly for 0-8 flow control semantics +org.apache.qpid.test.client.FlowControlTest +// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail. +org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection +// c++ broker doesn't do selectors, so this will fail +org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue + diff --git a/qpid/java/cpp.sync.testprofile b/qpid/java/cpp.noprefetch.testprofile index 961b595f89..1e4f62dd8c 100644 --- a/qpid/java/cpp.sync.testprofile +++ b/qpid/java/cpp.noprefetch.testprofile @@ -1,3 +1,4 @@ broker.version=0-10 -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 -test.excludesfile=${project.root}/010ExcludeList-store +broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/libbdbstore.so --auth no +test.excludesfile=${project.root}/010ExcludeList-noPrefetch +max_prefetch=0
\ No newline at end of file |