diff options
| author | Aidan Skinner <aidan@apache.org> | 2009-10-11 23:22:08 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2009-10-11 23:22:08 +0000 |
| commit | 98cc985dbd81a84cd0b0a969c57cb941680ec81f (patch) | |
| tree | a9060c1f208897cbd9dd4791b29202c78566993b /qpid/cpp/src/tests/run_federation_tests | |
| parent | 788f96fd8af146cba5bff57300b1a513988c34b9 (diff) | |
| download | qpid-python-98cc985dbd81a84cd0b0a969c57cb941680ec81f.tar.gz | |
Merge from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@824198 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/run_federation_tests')
| -rwxr-xr-x | qpid/cpp/src/tests/run_federation_tests | 4 |
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 8640fb728f..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 +. `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 |