summaryrefslogtreecommitdiff
path: root/cpp/src/tests/python_tests
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-09-28 21:17:31 +0000
committerAlan Conway <aconway@apache.org>2009-09-28 21:17:31 +0000
commit576b578d61d0d31082587bf77a25a59da2ba738f (patch)
treee1b49a066a2263794e43276dfa4b97bb5d9112b5 /cpp/src/tests/python_tests
parent4b8343c7a9461a5d80858a020cdabde684d722f7 (diff)
downloadqpid-python-576b578d61d0d31082587bf77a25a59da2ba738f.tar.gz
Fix python tests to work in VPATH builds and for make distcheck.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@819738 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/python_tests')
-rwxr-xr-xcpp/src/tests/python_tests10
1 files changed, 3 insertions, 7 deletions
diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests
index aa13f329ed..e2077ef7dc 100755
--- a/cpp/src/tests/python_tests
+++ b/cpp/src/tests/python_tests
@@ -20,14 +20,10 @@
#
# Run the python tests.
+. `dirname $0`/python_env.sh
QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
-QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-`dirname $0`/../../../python/temp}
FAILING=${FAILING:-/dev/null}
-if test -d $QPID_PYTHON_DIR; then
- cd $QPID_PYTHON_DIR
- ./qpid-python-test -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || { echo "FAIL python tests"; exit 1; }
-else
- echo "WARNING: No python tests. $QPID_PYTHON_DIR not found."
-fi
+cd $PYTHON_DIR
+python commands/qpid-python-test -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1