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 | dcce508e64e8a32ed38390dc959e90af69bc0076 (patch) | |
| tree | c8e1c7324531b89796c3e97ee9c9b61ced8c091f /cpp/src/tests/run_federation_sys_tests | |
| parent | ebce8e9e3569d34fe2e4bc39513b82066e283488 (diff) | |
| download | qpid-python-dcce508e64e8a32ed38390dc959e90af69bc0076.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_federation_sys_tests')
| -rwxr-xr-x | cpp/src/tests/run_federation_sys_tests | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cpp/src/tests/run_federation_sys_tests b/cpp/src/tests/run_federation_sys_tests index f5f772d72e..76da176914 100755 --- a/cpp/src/tests/run_federation_sys_tests +++ b/cpp/src/tests/run_federation_sys_tests @@ -26,12 +26,8 @@ source ./test_env.sh MODULENAME=federation_sys # Test for clustering -ps -u root | grep 'aisexec\|corosync' > /dev/null -if (( $? == 0 )); then - CLUSTERING_ENABLED=1 -else - echo "WARNING: No clustering detected; tests using it will be ignored." -fi +source cpg_check.sh +if cpg_enabled; then CLUSTERING_ENABLED=1; fi # Test for long test if [[ "$1" == "LONG_TEST" ]]; then |