summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-11-20 14:33:31 +0000
committerAlan Conway <aconway@apache.org>2009-11-20 14:33:31 +0000
commit70446712966844eb717bff92a076d8c808cd8255 (patch)
treec923ddcbffabe205eff9e31d469a457de277b17d /cpp/src
parentb9ad21420893114861a918f5c9c7d9c6ea9e75c6 (diff)
downloadqpid-python-70446712966844eb717bff92a076d8c808cd8255.tar.gz
Fix distcheck failure: don't try to run python tests if python not available.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@882573 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rwxr-xr-xcpp/src/tests/run_cluster_tests9
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/tests/run_cluster_tests b/cpp/src/tests/run_cluster_tests
index 4f09c141b3..9546ddf938 100755
--- a/cpp/src/tests/run_cluster_tests
+++ b/cpp/src/tests/run_cluster_tests
@@ -20,11 +20,14 @@
#
srcdir=$(dirname $0)
-
. $srcdir/test_env.sh checkout $srcdir/../../.. ../.. || exit 1
-PYTHONPATH=$srcdir:$PYTHONPATH
. $srcdir/ais_check
+TEST_EXEC=$QPID_PYTHON_COMMANDS/qpid-python-test
+test -x $TEST_EXEC || { echo Skipping test, $TEST_EXEC not found; exit 0; }
+
+PYTHONPATH=$srcdir:$PYTHONPATH
+
# Delete old cluster test data
OUTDIR=brokertest.tmp
rm -rf $OUTDIR
@@ -35,6 +38,6 @@ CLUSTER_TESTS_IGNORE=${CLUSTER_TESTS_IGNORE:--i cluster_tests.StoreTests.* -I $s
CLUSTER_TESTS=${CLUSTER_TESTS:-$*}
set -x
-with_ais_group $QPID_PYTHON_COMMANDS/qpid-python-test -DOUTDIR=$OUTDIR -m cluster_tests $CLUSTER_TESTS_IGNORE $CLUSTER_TESTS || exit 1
+with_ais_group $TEST_EXEC -DOUTDIR=$OUTDIR -m cluster_tests $CLUSTER_TESTS_IGNORE $CLUSTER_TESTS || exit 1
rm -rf $OUTDIR
#exit 0