summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/run_federation_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
commit425d83fc95aa42e155341aac20b814d4bf7bae08 (patch)
tree7b0e8d1ff13b566d6e844a71f1da0fbadb0ee3f3 /qpid/cpp/src/tests/run_federation_tests
parent2765f90b4b80043f8f3d8e15afe14ad8e4cbd49e (diff)
downloadqpid-python-425d83fc95aa42e155341aac20b814d4bf7bae08.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@819738 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/run_federation_tests')
-rwxr-xr-xqpid/cpp/src/tests/run_federation_tests4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests
index a003967322..3fe4bccb13 100755
--- a/qpid/cpp/src/tests/run_federation_tests
+++ b/qpid/cpp/src/tests/run_federation_tests
@@ -21,7 +21,7 @@
# Run the federation tests.
MY_DIR=`dirname \`which $0\``
-PYTHON_DIR=${MY_DIR}/../../../python/temp
+. `dirname $0`/python_env.sh
trap stop_brokers INT TERM QUIT
@@ -42,7 +42,7 @@ if test -d ${PYTHON_DIR} ; then
echo "Running federation tests using brokers on ports $LOCAL_PORT $REMOTE_PORT"
PYTHONPATH=${PYTHON_DIR}:${MY_DIR}
export PYTHONPATH
- ${PYTHON_DIR}/qpid-python-test -m federation -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT $@
+ $PYTHON_COMMANDS/qpid-python-test -m federation -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT $@
RETCODE=$?
stop_brokers
if test x$RETCODE != x0; then