From a5273319e880200c1e3b26e140a9cf8423daf3ce Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Wed, 8 Jul 2009 14:22:11 +0000 Subject: moved test profiles and related resources into test-profiles subdirectory git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@792157 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 qpid/java/test-profiles/cpp.testprofile (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile new file mode 100644 index 0000000000..a09c097cb7 --- /dev/null +++ b/qpid/java/test-profiles/cpp.testprofile @@ -0,0 +1,3 @@ +broker.version=0-10 +broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --auth no +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList -- cgit v1.2.1 From f8615b90193e0493adfb64ed3973797f60727dfc Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 14 Jul 2009 19:51:03 +0000 Subject: added support for profile inheritence and refactored profiles to permit convenient overriding of broker location and additional broker arguments git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@794037 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index a09c097cb7..aed4a0adca 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -1,3 +1,6 @@ broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --auth no +broker.command=${project.root}/../cpp/src/qpidd +broker.modules= +broker.args= +broker=${broker.command} -p @PORT --data-dir ${build.data}/@PORT -t --auth no ${broker.modules} ${broker.args} test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList -- cgit v1.2.1 From 6bd0e9b3ff37431b539bf2db22117c5ee099a2f9 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Wed, 15 Jul 2009 15:20:55 +0000 Subject: added --no-module-dir to broker invocation to prevent system brokers from loading unexpected modules git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@794300 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index aed4a0adca..da39a6284f 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -2,5 +2,5 @@ broker.version=0-10 broker.command=${project.root}/../cpp/src/qpidd broker.modules= broker.args= -broker=${broker.command} -p @PORT --data-dir ${build.data}/@PORT -t --auth no ${broker.modules} ${broker.args} +broker=${broker.command} -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 -- cgit v1.2.1 From 5f7116bbba781af8910a2bed9e842aa2839b3d96 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Fri, 17 Jul 2009 11:53:43 +0000 Subject: added system properties for controlling the module locations used during test runs; concat all the profile properties together before loading so that more can be shared between profiles; added an @SSL_PORT to the substitutions done by QpidTestCase git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@795056 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index da39a6284f..1156ae6b8c 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -1,6 +1,17 @@ broker.version=0-10 -broker.command=${project.root}/../cpp/src/qpidd + +broker.dir=${project.root}/../cpp/src +module.dir=${broker.dir}/.libs +store.dir=${project.root}/../../cppStore/cpp/lib/.libs + +broker.executable=${broker.dir}/qpidd +broker.module.ssl=${module.dir}/ssl.so +broker.module.cluster=${module.dir}/cluster.so +broker.module.store=${store.dir}/msgstore.so + broker.modules= broker.args= -broker=${broker.command} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${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 -- cgit v1.2.1 From a86f4edcb85253259716fd10618930c0de1380d5 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Mon, 20 Jul 2009 12:29:19 +0000 Subject: changed the confusingly named store.dir parameter to store.module.dir git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@795799 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 1156ae6b8c..414e364ecc 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -2,12 +2,12 @@ broker.version=0-10 broker.dir=${project.root}/../cpp/src module.dir=${broker.dir}/.libs -store.dir=${project.root}/../../cppStore/cpp/lib/.libs +store.module.dir=${project.root}/../../cppStore/cpp/lib/.libs broker.executable=${broker.dir}/qpidd broker.module.ssl=${module.dir}/ssl.so broker.module.cluster=${module.dir}/cluster.so -broker.module.store=${store.dir}/msgstore.so +broker.module.store=${store.module.dir}/msgstore.so broker.modules= broker.args= -- cgit v1.2.1 From 413663a124d73021ca99b2bf0a9efdfd22b7957e Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Sat, 25 Jul 2009 02:39:16 +0000 Subject: eliminate duplication between exclude lists for the various cpp profiles git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@797706 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 414e364ecc..0febcdb328 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -14,4 +14,4 @@ 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.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/${profile}.excludes -- cgit v1.2.1 From d7a34316af75bb1757d56d48cc0972674479c4cb Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Mon, 27 Jul 2009 18:32:33 +0000 Subject: rationalized naming of exclude files to make it clear why tests are excluded and where new exclusions should go; this also corrects the exclusion lists for some of the less common profiles since they now always include the 010Excludes which previously had to be manually copied to the other 010 profiles git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@798246 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 0febcdb328..1d5416fe19 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/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} -- cgit v1.2.1 From acc1d4c9eb818e038ab48143ddbce3fd51397cb2 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Thu, 17 Sep 2009 11:37:29 +0000 Subject: Update to QpidTestCase to only check for broker.stopped lines until we have found the ready line. Added broker.stopped line to cpp.testprofile 'Exception constructed' this identifies port conflict issues. Local testing has shown that this works as expected. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@816150 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 1d5416fe19..b3b979c786 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -8,6 +8,7 @@ broker.executable=${broker.dir}/qpidd broker.module.ssl=${module.dir}/ssl.so broker.module.cluster=${module.dir}/cluster.so broker.module.store=${store.module.dir}/msgstore.so +broker.stopped=Exception constructed broker.modules= broker.args= -- cgit v1.2.1 From 7ec3267d45da37c1997723a719965d2390b4bc6d Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 7 Dec 2009 15:19:02 +0000 Subject: QPID-1992 : Exclude message move test from CPP broker as it uses JMX. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@887950 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index b3b979c786..0f7a718a8b 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -16,4 +16,4 @@ broker.args= broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} profile.excludes=010PrefetchExcludes 010TransientExcludes -test.excludes=Excludes 010Excludes ${profile}.excludes ${profile.excludes} +test.excludes=Excludes 010Excludes ${profile}.excludes ${profile.excludes} cpp.excludes -- cgit v1.2.1 From f2b9b400af5cfa5b389aac91072ab24f7a3f4ed1 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Sat, 12 Dec 2009 00:05:38 +0000 Subject: Changed the profile to use the new files names and the new CPPExculeds file git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@889865 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 0f7a718a8b..04407accc3 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -15,5 +15,5 @@ broker.args= broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} -profile.excludes=010PrefetchExcludes 010TransientExcludes -test.excludes=Excludes 010Excludes ${profile}.excludes ${profile.excludes} cpp.excludes +profile.excludes=CPPPrefetchExcludes CPPTransientExcludes +test.excludes=Excludes CPPExcludes ${profile}.excludes ${profile.excludes} cpp.excludes -- cgit v1.2.1 From 8b7d3c0aaca53585c04c3e8d7b795045460ce58b Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Wed, 3 Feb 2010 15:59:26 +0000 Subject: Added the property broker.language git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@906099 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 04407accc3..f6d8d6f353 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -1,4 +1,5 @@ broker.version=0-10 +broker.language=cpp broker.dir=${project.root}/../cpp/src module.dir=${broker.dir}/.libs -- cgit v1.2.1 From aaabede31fc48296076bc57abe07eddcb4fd55d0 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Tue, 16 Feb 2010 23:51:40 +0000 Subject: This is related to QPID-2404 The C++ broker removes stales messages using the following strategies a) If a consumer requests a messages, it checks the head and discards it if it's expired b) Runs the queue cleaner thread every x (defaults to 5 mins) secs and discards stale messages. I enabled the TimeToLiveTest (by commenting it out) and reduced the --queue-purge-interval to 1 sec. This may interfere with other tests. If that happens I will try to increase above interval and the test timeout and see if we could get by. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@910777 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index f6d8d6f353..65d05d0bfd 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -12,7 +12,7 @@ broker.module.store=${store.module.dir}/msgstore.so broker.stopped=Exception constructed broker.modules= -broker.args= +broker.args=--queue-purge-interval 1 broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} -- cgit v1.2.1 From 7e57938eb813975c83e738b5c3f6543117b34a38 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Wed, 17 Feb 2010 14:20:27 +0000 Subject: This is related to QPID-1575 Lowering the queue cleaner interval in the broker does not seem to work properly. Therefore I am disabling the testActiveTTL test and removing the queue purge interval explictly set in the profile. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@910987 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 65d05d0bfd..f6d8d6f353 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -12,7 +12,7 @@ broker.module.store=${store.module.dir}/msgstore.so broker.stopped=Exception constructed broker.modules= -broker.args=--queue-purge-interval 1 +broker.args= broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args} -- cgit v1.2.1 From e0e0eda8308719a3da0a6f886395641b542eac54 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 31 Oct 2010 23:40:12 +0000 Subject: add ASF licence to Java .testprofile and exclude files git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1029522 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/cpp.testprofile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'qpid/java/test-profiles/cpp.testprofile') diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index f6d8d6f353..694e22f48c 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -1,3 +1,21 @@ +# +# 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. +# broker.version=0-10 broker.language=cpp -- cgit v1.2.1