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_cli_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_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 ea0d591176..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 -CLI_DIR=${PYTHON_DIR}/commands +. `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 |