From ea698e61570219c56ada87aad248e53719c7585f Mon Sep 17 00:00:00 2001 From: Arnaud Simon Date: Fri, 27 Jun 2008 14:24:51 +0000 Subject: QPID-1157: Added CC scripts and config files git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@672280 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cc/config.xml | 25 +++++ qpid/cc/config/bdbstore-cpp-trunk.xml | 48 +++++++++ qpid/cc/config/cpp-trunk-perftests.xml | 63 ++++++++++++ qpid/cc/config/cpp-trunk.xml | 48 +++++++++ qpid/cc/config/java-trunk.xml | 136 +++++++++++++++++++++++++ qpid/cc/config/java/cpp.noprefetch.testprofile | 18 ++++ qpid/cc/config/java/cpp.testprofile | 19 ++++ qpid/cc/config/java/cppExcludeList | 15 +++ qpid/cc/config/java/cppNoPrefetchExcludeList | 18 ++++ qpid/cc/config/java/java.testprofile | 18 ++++ qpid/cc/config/java/javaExcludeList | 13 +++ qpid/cc/dashboard-config.xml | 31 ++++++ qpid/cc/scripts/bdbstorecppbuild.sh | 26 +++++ qpid/cc/scripts/build.xml | 26 +++++ qpid/cc/scripts/cppbuild-perftests.sh | 23 +++++ qpid/cc/scripts/cppbuild.sh | 21 ++++ qpid/cc/scripts/javaconfig.sh | 25 +++++ qpid/cc/scripts/javareport.sh | 25 +++++ 18 files changed, 598 insertions(+) create mode 100644 qpid/cc/config.xml create mode 100644 qpid/cc/config/bdbstore-cpp-trunk.xml create mode 100644 qpid/cc/config/cpp-trunk-perftests.xml create mode 100644 qpid/cc/config/cpp-trunk.xml create mode 100644 qpid/cc/config/java-trunk.xml create mode 100644 qpid/cc/config/java/cpp.noprefetch.testprofile create mode 100644 qpid/cc/config/java/cpp.testprofile create mode 100644 qpid/cc/config/java/cppExcludeList create mode 100644 qpid/cc/config/java/cppNoPrefetchExcludeList create mode 100644 qpid/cc/config/java/java.testprofile create mode 100644 qpid/cc/config/java/javaExcludeList create mode 100644 qpid/cc/dashboard-config.xml create mode 100755 qpid/cc/scripts/bdbstorecppbuild.sh create mode 100644 qpid/cc/scripts/build.xml create mode 100755 qpid/cc/scripts/cppbuild-perftests.sh create mode 100755 qpid/cc/scripts/cppbuild.sh create mode 100755 qpid/cc/scripts/javaconfig.sh create mode 100755 qpid/cc/scripts/javareport.sh diff --git a/qpid/cc/config.xml b/qpid/cc/config.xml new file mode 100644 index 0000000000..3b94d568b7 --- /dev/null +++ b/qpid/cc/config.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/qpid/cc/config/bdbstore-cpp-trunk.xml b/qpid/cc/config/bdbstore-cpp-trunk.xml new file mode 100644 index 0000000000..ce80d37820 --- /dev/null +++ b/qpid/cc/config/bdbstore-cpp-trunk.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cc/config/cpp-trunk-perftests.xml b/qpid/cc/config/cpp-trunk-perftests.xml new file mode 100644 index 0000000000..8a5079b60b --- /dev/null +++ b/qpid/cc/config/cpp-trunk-perftests.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cc/config/cpp-trunk.xml b/qpid/cc/config/cpp-trunk.xml new file mode 100644 index 0000000000..7943dac6de --- /dev/null +++ b/qpid/cc/config/cpp-trunk.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cc/config/java-trunk.xml b/qpid/cc/config/java-trunk.xml new file mode 100644 index 0000000000..5fdfb39a41 --- /dev/null +++ b/qpid/cc/config/java-trunk.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cc/config/java/cpp.noprefetch.testprofile b/qpid/cc/config/java/cpp.noprefetch.testprofile new file mode 100644 index 0000000000..a69a5295f5 --- /dev/null +++ b/qpid/cc/config/java/cpp.noprefetch.testprofile @@ -0,0 +1,18 @@ +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 +broker.clean=${project.root}/clean-dir ${build.data} +java.naming.provider.url=${project.root}/test-provider.properties +test.excludes=true +broker.ready=Listening on TCP port +test.excludesfile=${project.root}/cppNoPrefetchExcludeList +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 +haltonfailure=no +haltonerror=no +max_prefetch=0 +exclude.modules=systests \ No newline at end of file diff --git a/qpid/cc/config/java/cpp.testprofile b/qpid/cc/config/java/cpp.testprofile new file mode 100644 index 0000000000..63b36638ad --- /dev/null +++ b/qpid/cc/config/java/cpp.testprofile @@ -0,0 +1,19 @@ +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 +broker.clean=${project.root}/clean-dir ${build.data} +java.naming.provider.url=${project.root}/test-provider.properties +test.excludes=true +test.excludesfile=${project.root}/010AsyncExcludeList +broker.ready=Listening on TCP port +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 +max_prefetch=1000 +exclude.modules=systests \ No newline at end of file diff --git a/qpid/cc/config/java/cppExcludeList b/qpid/cc/config/java/cppExcludeList new file mode 100644 index 0000000000..ff93dd00b8 --- /dev/null +++ b/qpid/cc/config/java/cppExcludeList @@ -0,0 +1,15 @@ +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.DurableSubscriberTest#testDurSubRestoresMessageSelector +// the 0.10 c++ broker does not implement forget +org.apache.qpid.test.unit.xa.FaultTest#testForget +// removed because of bug 445500 +// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityAUTOACK +// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityNOACKSessionPerConnection \ No newline at end of file diff --git a/qpid/cc/config/java/cppNoPrefetchExcludeList b/qpid/cc/config/java/cppNoPrefetchExcludeList new file mode 100644 index 0000000000..173d837ab1 --- /dev/null +++ b/qpid/cc/config/java/cppNoPrefetchExcludeList @@ -0,0 +1,18 @@ +// those tests use 0.8 semantics +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 is not finished +org.apache.qpid.test.testcases.TTLTest#* +// the 0.10 c++ broker does not implement forget +org.apache.qpid.test.unit.xa.FaultTest#testForget +// See Bug 443031 +org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash +// removed because of bug 445500 +// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityAUTOACK +// org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurabilityNOACKSessionPerConnection +// trace sent to Gordon +// org.apache.qpid.test.unit.basic.SelectorTest#* \ No newline at end of file diff --git a/qpid/cc/config/java/java.testprofile b/qpid/cc/config/java/java.testprofile new file mode 100644 index 0000000000..a0eacd0516 --- /dev/null +++ b/qpid/cc/config/java/java.testprofile @@ -0,0 +1,18 @@ +broker.version=0-8 +broker=vm +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 +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 +max_prefetch=1000 +exclude.modules=systests \ No newline at end of file diff --git a/qpid/cc/config/java/javaExcludeList b/qpid/cc/config/java/javaExcludeList new file mode 100644 index 0000000000..5e5bf715ad --- /dev/null +++ b/qpid/cc/config/java/javaExcludeList @@ -0,0 +1,13 @@ +org.apache.qpid.test.unit.xa.QueueTest#* +org.apache.qpid.test.unit.xa.TopicTest#* +org.apache.qpid.test.unit.xa.FaultTest#* +org.apache.qpid.test.unit.ct.DurableSubscriberTests#* +// those tests are failing see: QPID- +org.apache.qpid.test.unit.topic.TopicSessionTest#testNoLocal +// known issue +org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurableWithInvalidSelector +// Those tests are not finished +org.apache.qpid.test.testcases.TTLTest#* +org.apache.qpid.test.testcases.FailoverTest#* +// See qpid-1144 +org.apache.qpid.test.testcases.ImmediateMessageTest#* diff --git a/qpid/cc/dashboard-config.xml b/qpid/cc/dashboard-config.xml new file mode 100644 index 0000000000..9304322853 --- /dev/null +++ b/qpid/cc/dashboard-config.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + diff --git a/qpid/cc/scripts/bdbstorecppbuild.sh b/qpid/cc/scripts/bdbstorecppbuild.sh new file mode 100755 index 0000000000..9096e13e31 --- /dev/null +++ b/qpid/cc/scripts/bdbstorecppbuild.sh @@ -0,0 +1,26 @@ +#!/bin/bash +########################################################### +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. +########################################################### + +if [ -f Makefile ]; then + make distclean +fi + ./bootstrap && \ + ./configure CXXFLAGS="-O3 -DNDEBUG" --with-qpid-checkout=$CC_HOME && \ + make diff --git a/qpid/cc/scripts/build.xml b/qpid/cc/scripts/build.xml new file mode 100644 index 0000000000..a9e91e21ce --- /dev/null +++ b/qpid/cc/scripts/build.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/qpid/cc/scripts/cppbuild-perftests.sh b/qpid/cc/scripts/cppbuild-perftests.sh new file mode 100755 index 0000000000..782a472175 --- /dev/null +++ b/qpid/cc/scripts/cppbuild-perftests.sh @@ -0,0 +1,23 @@ +#!/bin/bash +########################################################### +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. +########################################################### + +cd $CC_HOME/cpp +svn stat --no-ignore | awk '/^[I?]/{print $2}' | xargs rm -r +./bootstrap && ./configure CXXFLAGS="-O3 -DNDEBUG" && make -j4 all && cd src/tests && make -j4 check diff --git a/qpid/cc/scripts/cppbuild.sh b/qpid/cc/scripts/cppbuild.sh new file mode 100755 index 0000000000..b63feb7141 --- /dev/null +++ b/qpid/cc/scripts/cppbuild.sh @@ -0,0 +1,21 @@ +#!/bin/bash -x +########################################################### +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. +########################################################### + +make distclean && ./bootstrap && ./configure && make \ No newline at end of file diff --git a/qpid/cc/scripts/javaconfig.sh b/qpid/cc/scripts/javaconfig.sh new file mode 100755 index 0000000000..74e5063bab --- /dev/null +++ b/qpid/cc/scripts/javaconfig.sh @@ -0,0 +1,25 @@ +#!/bin/bash +########################################################### +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. +########################################################### + +# 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/. +cp $CC_HOME/cc/config/java/java.testprofile $CC_HOME/java/. \ No newline at end of file diff --git a/qpid/cc/scripts/javareport.sh b/qpid/cc/scripts/javareport.sh new file mode 100755 index 0000000000..2b2469d31d --- /dev/null +++ b/qpid/cc/scripts/javareport.sh @@ -0,0 +1,25 @@ +#!/bin/bash +########################################################### +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. +########################################################### +cd "$CC_HOME/java/build" +pwd +if [[ -d report_$1 ]]; then rm -fr report_$1; fi +if [[ -d report ]]; then mv report report_$1; fi +rm -rf ./results/* +rm -rf ./data/* \ No newline at end of file -- cgit v1.2.1