diff options
| author | Alan Conway <aconway@apache.org> | 2012-04-16 19:20:30 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-04-16 19:20:30 +0000 |
| commit | c121e4803971122f703730eb65c8d7bfdeec916f (patch) | |
| tree | 533b5ba34eadb63eca73ecb5aeaafbdcb5f6ea1c /qpid/cpp/src/tests/start_cluster | |
| parent | 0dde682105118b364773e2bee18021734edcf573 (diff) | |
| download | qpid-python-c121e4803971122f703730eb65c8d7bfdeec916f.tar.gz | |
NO-JIRA: Control running of cluster tests.
Previously cluster tests would run if cluster services were running, even
if build was explicitly configured without CPG. Don't run cluster tests
unless the build is configured with CPG.
If the build is configured *with* CPG, you can still skip the CPG tests by setting
QPID_USE_CPG=no in the environment.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1326756 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/start_cluster')
| -rwxr-xr-x | qpid/cpp/src/tests/start_cluster | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/start_cluster b/qpid/cpp/src/tests/start_cluster index 84f98b3b2d..78fd104d9c 100755 --- a/qpid/cpp/src/tests/start_cluster +++ b/qpid/cpp/src/tests/start_cluster @@ -24,7 +24,8 @@ # Execute command with the ais group set. source ./test_env.sh -. `dirname $0`/ais_check +source cpg_check.sh +cpg_enabled || exit 0 rm -f cluster*.log cluster.ports qpidd.port |