From 576b578d61d0d31082587bf77a25a59da2ba738f Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 28 Sep 2009 21:17:31 +0000
Subject: 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
---
 cpp/src/tests/python_tests | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'cpp/src/tests/python_tests')

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
-- 
cgit v1.2.1