From 70446712966844eb717bff92a076d8c808cd8255 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 20 Nov 2009 14:33:31 +0000 Subject: 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 --- cpp/src/tests/run_cluster_tests | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'cpp/src') 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 -- cgit v1.2.1