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/python_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/python_tests')
| -rwxr-xr-x | qpid/cpp/src/tests/python_tests | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests index aa13f329ed..e2077ef7dc 100755 --- a/qpid/cpp/src/tests/python_tests +++ b/qpid/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 |