diff options
| author | Alan Conway <aconway@apache.org> | 2008-05-14 15:39:02 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-05-14 15:39:02 +0000 |
| commit | ddb57760e7e3ec1ea54a8dfccd9b3087cbffb80a (patch) | |
| tree | 7f2362e2a884b7193864521539d75207de07b8ab /cpp/src | |
| parent | 0a554501a3cce16c56fb11f7e9b53d9720fecb92 (diff) | |
| download | qpid-python-ddb57760e7e3ec1ea54a8dfccd9b3087cbffb80a.tar.gz | |
Fix valgrind problems in VPATH builds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@656320 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/tests/Makefile.am | 13 | ||||
| -rwxr-xr-x | cpp/src/tests/python_tests | 14 | ||||
| -rw-r--r-- | cpp/src/tests/valgrind.suppress (renamed from cpp/src/tests/.valgrind.supp) | 0 | ||||
| -rw-r--r-- | cpp/src/tests/valgrindrc (renamed from cpp/src/tests/.valgrindrc) | 2 |
4 files changed, 17 insertions, 12 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index cb060cb2b4..0c77f1c605 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -125,10 +125,17 @@ testprogs= \ client_test \ topic_listener \ topic_publisher -# echo_service check_PROGRAMS += $(testprogs) interop_runner publish consume +# Copy the SVN valgrind files to the real valgrind files so we will +# have the real files in the working dir for VPATH or in-tree builds. +check_DATA = .valgrindrc .valgrind.suppress +.valgrindrc: valgrindrc + cp $^ $@ +.valgrind.suppress: valgrind.suppress + cp $^ $@ + TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR= $(srcdir)/run_test system_tests = client_test quick_perftest quick_topictest @@ -141,8 +148,8 @@ EXTRA_DIST += \ quick_perftest \ topictest \ run_federation_tests \ - .valgrind.supp \ - .valgrindrc \ + valgrind.suppress \ + valgrindrc \ MessageUtils.h \ MockConnectionInputHandler.h \ TxMocks.h \ diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests index e4b70f5ff5..3065845c66 100755 --- a/cpp/src/tests/python_tests +++ b/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 + diff --git a/cpp/src/tests/.valgrind.supp b/cpp/src/tests/valgrind.suppress index bffde9d815..bffde9d815 100644 --- a/cpp/src/tests/.valgrind.supp +++ b/cpp/src/tests/valgrind.suppress diff --git a/cpp/src/tests/.valgrindrc b/cpp/src/tests/valgrindrc index 76bac021d8..da0c2c9aca 100644 --- a/cpp/src/tests/.valgrindrc +++ b/cpp/src/tests/valgrindrc @@ -1,7 +1,7 @@ --gen-suppressions=all --leak-check=full --demangle=yes ---suppressions=.valgrind.supp +--suppressions=.valgrind.suppress --num-callers=25 --trace-children=yes --error-exitcode=1 |