diff options
| -rw-r--r-- | java/module.xml | 3 | ||||
| -rw-r--r-- | java/test-profiles/cpp.async.testprofile | 4 | ||||
| -rw-r--r-- | java/test-profiles/cpp.cluster.testprofile | 4 | ||||
| -rw-r--r-- | java/test-profiles/cpp.noprefetch.testprofile | 4 | ||||
| -rw-r--r-- | java/test-profiles/cpp.ssl.testprofile | 4 | ||||
| -rw-r--r-- | java/test-profiles/cpp.testprofile | 5 |
6 files changed, 15 insertions, 9 deletions
diff --git a/java/module.xml b/java/module.xml index 51b9c176c1..1bfc1931a4 100644 --- a/java/module.xml +++ b/java/module.xml @@ -231,6 +231,9 @@ <property file="${test.profiles}/${config}"/> + <foreach property="_profile_" list="${profile.inherit}"> + <property file="${test.profiles}/${_profile_}.testprofile"/> + </foreach> <property file="${test.profiles}/default.testprofile"/> <condition property="dontruntest" value="dontruntest" else="runtest"> diff --git a/java/test-profiles/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile index 1c467a0b79..c1fe31040e 100644 --- a/java/test-profiles/cpp.async.testprofile +++ b/java/test-profiles/cpp.async.testprofile @@ -1,3 +1,3 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no +profile.inherit=cpp +broker.modules=--load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-store diff --git a/java/test-profiles/cpp.cluster.testprofile b/java/test-profiles/cpp.cluster.testprofile index 8e8e48e777..9bb5bc6af6 100644 --- a/java/test-profiles/cpp.cluster.testprofile +++ b/java/test-profiles/cpp.cluster.testprofile @@ -1,5 +1,5 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd --load-module ${project.root}/../cpp/src/.libs/cluster.so --cluster-name cpp-java-test-cluster -p @PORT --data-dir ${build.data}/@PORT -t --auth no +profile.inherit=cpp +broker.modules=--load-module ${project.root}/../cpp/src/.libs/cluster.so --cluster-name cpp-java-test-cluster test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/010ExcludeList profile.clustered=true diff --git a/java/test-profiles/cpp.noprefetch.testprofile b/java/test-profiles/cpp.noprefetch.testprofile index d4cac445da..4e08200e94 100644 --- a/java/test-profiles/cpp.noprefetch.testprofile +++ b/java/test-profiles/cpp.noprefetch.testprofile @@ -1,4 +1,4 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no +profile.inherit=cpp +broker.modules=--load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch max_prefetch=0 diff --git a/java/test-profiles/cpp.ssl.testprofile b/java/test-profiles/cpp.ssl.testprofile index 9d54f03569..072840372c 100644 --- a/java/test-profiles/cpp.ssl.testprofile +++ b/java/test-profiles/cpp.ssl.testprofile @@ -1,5 +1,5 @@ -broker.version=0-10 -broker=${project.root}/../cpp/src/qpidd -p @PORT --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 --data-dir ${build.data}/@PORT -t --auth no +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 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 diff --git a/java/test-profiles/cpp.testprofile b/java/test-profiles/cpp.testprofile index a09c097cb7..aed4a0adca 100644 --- a/java/test-profiles/cpp.testprofile +++ b/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 |