diff options
| author | Alan Conway <aconway@apache.org> | 2009-09-28 21:17:31 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-09-28 21:17:31 +0000 |
| commit | 425d83fc95aa42e155341aac20b814d4bf7bae08 (patch) | |
| tree | 7b0e8d1ff13b566d6e844a71f1da0fbadb0ee3f3 /qpid/cpp/src/tests/run_cli_tests | |
| parent | 2765f90b4b80043f8f3d8e15afe14ad8e4cbd49e (diff) | |
| download | qpid-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_cli_tests')
| -rwxr-xr-x | qpid/cpp/src/tests/run_cli_tests | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/run_cli_tests b/qpid/cpp/src/tests/run_cli_tests index e526c561f2..bb9605410c 100755 --- a/qpid/cpp/src/tests/run_cli_tests +++ b/qpid/cpp/src/tests/run_cli_tests @@ -21,8 +21,8 @@ # Run the cli-utility tests. MY_DIR=`dirname \`which $0\`` -PYTHON_DIR=${MY_DIR}/../../../python/temp -CLI_DIR=${PYTHON_DIR} +. `dirname $0`/python_env.sh +CLI_DIR=$PYTHON_COMMANDS trap stop_brokers INT TERM QUIT @@ -43,7 +43,7 @@ if test -d ${PYTHON_DIR} ; then echo "Running CLI tests using brokers on ports $LOCAL_PORT $REMOTE_PORT" PYTHONPATH=${PYTHON_DIR}:${MY_DIR} export PYTHONPATH - ${PYTHON_DIR}/qpid-python-test -m cli_tests -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dcli-dir=$CLI_DIR $@ + $PYTHON_COMMANDS/qpid-python-test -m cli_tests -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dcli-dir=$CLI_DIR $@ RETCODE=$? stop_brokers if test x$RETCODE != x0; then |