diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/tests/.valgrind.supp (renamed from cpp/src/tests/valgrind.suppress) | 0 | ||||
| -rw-r--r-- | cpp/src/tests/.valgrindrc (renamed from cpp/src/tests/valgrindrc) | 2 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 13 | ||||
| -rwxr-xr-x | cpp/src/tests/python_tests | 14 |
4 files changed, 12 insertions, 17 deletions
diff --git a/cpp/src/tests/valgrind.suppress b/cpp/src/tests/.valgrind.supp index bffde9d815..bffde9d815 100644 --- a/cpp/src/tests/valgrind.suppress +++ b/cpp/src/tests/.valgrind.supp diff --git a/cpp/src/tests/valgrindrc b/cpp/src/tests/.valgrindrc index da0c2c9aca..76bac021d8 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.suppress +--suppressions=.valgrind.supp --num-callers=25 --trace-children=yes --error-exitcode=1 diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 0c77f1c605..cb060cb2b4 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -125,17 +125,10 @@ 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 @@ -148,8 +141,8 @@ EXTRA_DIST += \ quick_perftest \ topictest \ run_federation_tests \ - valgrind.suppress \ - valgrindrc \ + .valgrind.supp \ + .valgrindrc \ MessageUtils.h \ MockConnectionInputHandler.h \ TxMocks.h \ diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests index ff0519f6fe..e4b70f5ff5 100755 --- a/cpp/src/tests/python_tests +++ b/cpp/src/tests/python_tests @@ -1,17 +1,19 @@ #!/bin/sh # Run the python tests. - QPID_PORT=${QPID_PORT:-5672} PYTHON_TESTS=${PYTHON_TESTS:-$*} MY_DIR=$(dirname $(which $0)) -QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-$MY_DIR/../../../python} +PYTHON_DIR=${MY_DIR}/../../../python -do_tests() { +run() { 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; } } -cd ${QPID_PYTHON_DIR} || { echo "Cannot cd ${QPID_PYTHON_DIR}"; exit; } -do_tests 0-10-errata cpp_failing_0-10.txt - +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 |