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 | 3798363648334e04dfbd9ee73aee4c9de1bcd58d (patch) | |
| tree | c8e1c7324531b89796c3e97ee9c9b61ced8c091f /cpp/src/tests/run_cluster_test | |
| parent | b1b59f31cf7b4b8719e1cdc2ef6c0b6b6eb3843e (diff) | |
| download | qpid-python-3798363648334e04dfbd9ee73aee4c9de1bcd58d.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/qpid@1326756 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/run_cluster_test')
| -rwxr-xr-x | cpp/src/tests/run_cluster_test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/tests/run_cluster_test b/cpp/src/tests/run_cluster_test index c022eea1fe..11df3d63a3 100755 --- a/cpp/src/tests/run_cluster_test +++ b/cpp/src/tests/run_cluster_test @@ -22,5 +22,6 @@ # Run the tests srcdir=`dirname $0` -. $srcdir/ais_check +source cpg_check.sh +cpg_enabled || exit 0 with_ais_group $srcdir/run_test ./cluster_test |