summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/python_tests
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-05-14 15:39:02 +0000
committerAlan Conway <aconway@apache.org>2008-05-14 15:39:02 +0000
commit81ce314de5b5d7ffaa76a608cb54023e89e998ae (patch)
treef83bb8a2e76ec0d9e1e465bb3a7d9c2e0bb4feac /qpid/cpp/src/tests/python_tests
parent9cc70bbe0ed008653b050fe2e2fec0a90aa8ad1f (diff)
downloadqpid-python-81ce314de5b5d7ffaa76a608cb54023e89e998ae.tar.gz
Fix valgrind problems in VPATH builds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@656320 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/python_tests')
-rwxr-xr-xqpid/cpp/src/tests/python_tests14
1 files changed, 6 insertions, 8 deletions
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
index e4b70f5ff5..3065845c66 100755
--- a/qpid/cpp/src/tests/python_tests
+++ b/qpid/cpp/src/tests/python_tests
@@ -1,19 +1,17 @@
#!/bin/sh
# Run the python tests.
+
QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
MY_DIR=$(dirname $(which $0))
-PYTHON_DIR=${MY_DIR}/../../../python
+QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-$MY_DIR/../../../python}
-run() {
+do_tests() {
SPEC=$1
FAILING=$2
./run-tests --skip-self-test -v -s $SPEC -I $FAILING -b localhost:$QPID_PORT $PYTHON_TESTS || { echo "FAIL python tests for $SPEC"; exit 1; }
}
-if test -d ${PYTHON_DIR} ; then
- cd ${PYTHON_DIR}
- run 0-10-errata cpp_failing_0-10.txt
-else
- echo Warning: python tests not found.
-fi
+cd ${QPID_PYTHON_DIR} || { echo "Cannot cd ${QPID_PYTHON_DIR}"; exit 1; }
+do_tests 0-10-errata cpp_failing_0-10.txt
+