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

5 files changed, 27 insertions, 10 deletions

diff --git a/qpid/java/test-profiles/cpp.async.testprofile b/qpid/java/test-profiles/cpp.async.testprofile
index c1fe31040e..5b6834e8c0 100644
--- a/qpid/java/test-profiles/cpp.async.testprofile
+++ b/qpid/java/test-profiles/cpp.async.testprofile
@@ -1,3 +1,5 @@
-profile.inherit=cpp
-broker.modules=--load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so
+include=cpp
+
+broker.modules=--load-module ${broker.module.store}
+
 test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-store
diff --git a/qpid/java/test-profiles/cpp.cluster.testprofile b/qpid/java/test-profiles/cpp.cluster.testprofile
index 9bb5bc6af6..49ddc98f4f 100644
--- a/qpid/java/test-profiles/cpp.cluster.testprofile
+++ b/qpid/java/test-profiles/cpp.cluster.testprofile
@@ -1,5 +1,7 @@
-profile.inherit=cpp
-broker.modules=--load-module ${project.root}/../cpp/src/.libs/cluster.so --cluster-name cpp-java-test-cluster
+include=cpp
+
+broker.modules=--load-module ${broker.module.cluster} --cluster-name cpp-java-test-cluster
+
 test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/010ExcludeList
 
 profile.clustered=true
diff --git a/qpid/java/test-profiles/cpp.noprefetch.testprofile b/qpid/java/test-profiles/cpp.noprefetch.testprofile
index 4e08200e94..a488b89480 100644
--- a/qpid/java/test-profiles/cpp.noprefetch.testprofile
+++ b/qpid/java/test-profiles/cpp.noprefetch.testprofile
@@ -1,4 +1,3 @@
-profile.inherit=cpp
-broker.modules=--load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so
+include=cpp cpp.async
 test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch
 max_prefetch=0
diff --git a/qpid/java/test-profiles/cpp.ssl.testprofile b/qpid/java/test-profiles/cpp.ssl.testprofile
index 072840372c..08d4fd895a 100644
--- a/qpid/java/test-profiles/cpp.ssl.testprofile
+++ b/qpid/java/test-profiles/cpp.ssl.testprofile
@@ -1,7 +1,10 @@
-profile.inherit=cpp
-broker.modules=--load-module ${project.root}/../cpp/src/.libs/ssl.so --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile --ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/ --ssl-require-client-authentication
+include=cpp
+
+broker.modules=--load-module ${broker.module.ssl} --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile --ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/ --ssl-require-client-authentication --ssl-port @SSL_PORT
+
 test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/010ExcludeList-ssl
 test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#*
+
 profile.use_ssl=true
 broker.ready= Listening for SSL connections
 
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