From ddb57760e7e3ec1ea54a8dfccd9b3087cbffb80a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 14 May 2008 15:39:02 +0000 Subject: 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 --- cpp/src/tests/.valgrind.supp | 194 ---------------------------------------- cpp/src/tests/.valgrindrc | 8 -- cpp/src/tests/Makefile.am | 13 ++- cpp/src/tests/python_tests | 14 ++- cpp/src/tests/valgrind.suppress | 194 ++++++++++++++++++++++++++++++++++++++++ cpp/src/tests/valgrindrc | 8 ++ 6 files changed, 218 insertions(+), 213 deletions(-) delete mode 100644 cpp/src/tests/.valgrind.supp delete mode 100644 cpp/src/tests/.valgrindrc create mode 100644 cpp/src/tests/valgrind.suppress create mode 100644 cpp/src/tests/valgrindrc (limited to 'cpp') diff --git a/cpp/src/tests/.valgrind.supp b/cpp/src/tests/.valgrind.supp deleted file mode 100644 index bffde9d815..0000000000 --- a/cpp/src/tests/.valgrind.supp +++ /dev/null @@ -1,194 +0,0 @@ -{ - Benign error in libcpg. - Memcheck:Param - socketcall.sendmsg(msg.msg_iov[i]) - obj:*/libpthread-2.5.so - obj:*/libcpg.so.2.0.0 -} - -{ - Uninitialised value problem in _dl_relocate (F7, F8) - Memcheck:Cond - fun:_dl_relocate_object - fun:*dl_* -} - -{ - False "possibly leaked" in boost program_options - global std::string var. - Memcheck:Leak - fun:_Znwj - fun:_ZNSs4_Rep9_S_createEjjRKSaIcE - obj:/usr/lib/libstdc++.so.6.0.8 - fun:_ZNSsC1EPKcRKSaIcE - obj:/usr/lib/libboost_program_options.so.1.33.1 -} - -{ - Bogus epoll_ctl error on i386 - Memcheck:Param - epoll_ctl(event) - fun:epoll_ctl -} - -{ - boost 103200 -- we think Boost is responsible for these leaks. - Memcheck:Leak - fun:_Znwm - fun:_ZN5boost15program_options??options_description* -} - -{ - boost 103200 -- we think Boost is responsible for these leaks. - Memcheck:Leak - fun:_Znwm - fun:_ZN5boost9unit_test9test_case* -} - -{ - boost 103200 -- we think Boost is responsible for these leaks. - Memcheck:Leak - fun:calloc - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 - fun:_ZN4qpid3sys5Shlib4loadEPKc - fun:_Z9testShlibv - fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv - obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0 - fun:_ZN5boost17execution_monitor7executeEbi - fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi - fun:_ZN5boost9unit_test9test_case3runEv - fun:_ZN5boost9unit_test10test_suite6do_runEv - fun:_ZN5boost9unit_test9test_case3runEv - fun:main -} - -{ - boost 103200 -- we think Boost is responsible for these leaks. - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.2.5 - fun:_ZN4qpid6broker5Timer5startEv - fun:_ZN4qpid6broker5TimerC1Ev - fun:_ZN4qpid6broker10DtxManagerC1Ev - fun:_ZN4qpid6broker6BrokerC1ERKNS1_7OptionsE - fun:_ZN4qpid6broker6Broker6createERKNS1_7OptionsE - fun:_ZN15SessionFixtureTI15ProxyConnectionEC2Ev - fun:_Z14testQueueQueryv - fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv - obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0 - fun:_ZN5boost17execution_monitor7executeEbi - fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi - fun:_ZN5boost9unit_test9test_case3runEv - fun:_ZN5boost9unit_test10test_suite6do_runEv - fun:_ZN5boost9unit_test9test_case3runEv - fun:main -} - -{ - INVESTIGATE - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.2.5 - fun:_ZN4qpid6client9Connector4initEv - fun:_ZN4qpid6client14ConnectionImpl4openERKSsiS3_S3_S3_ -} - -{ - INVESTIGATE - Memcheck:Param - write(buf) - obj:/lib64/tls/libc-2.3.4.so - fun:_ZNK4qpid3sys6Socket5writeEPKvm - fun:_ZN4qpid3sys8AsynchIO9writeableERNS0_14DispatchHandleE -} - -{ - "Conditional jump or move depends on uninitialised value(s)" from Xerces parser - Memcheck:Cond - fun:_ZN11xercesc_2_717XMLUTF8Transcoder13transcodeFromEPKhjPtjRjPh - fun:_ZN11xercesc_2_79XMLReader14xcodeMoreCharsEPtPhj - fun:_ZN11xercesc_2_79XMLReader17refreshCharBufferEv -} - -{ - boost 103200 -- mgoulish -- fix this, sometime - Memcheck:Leak - fun:* - fun:* - obj:* - fun:* - fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_ -} - -{ - boost 103200 -- mgoulish -- fix this, sometime - Memcheck:Leak - fun:* - fun:* - fun:* - fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_ -} - -{ - INVESTIGATE - Memcheck:Param - socketcall.sendto(msg) - fun:send - fun:get_mapping - fun:__nscd_get_map_ref - fun:nscd_gethst_r - fun:__nscd_gethostbyname_r - fun:gethostbyname_r@@GLIBC_2.2.5 - fun:gethostbyname - fun:_ZNK4qpid3sys6Socket7connectERKSsi -} - -{ - INVESTIGATE - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.2.5 - fun:_ZN4qpid6broker5Timer5startEv - fun:_ZN4qpid6broker5TimerC1Ev - fun:_ZN4qpid6broker10DtxManagerC1Ev - fun:_ZN4qpid6broker6BrokerC1ERKNS1_7OptionsE - fun:_ZN4qpid6broker6Broker6createERKNS1_7OptionsE - fun:_ZN20ClientSessionFixtureC1Ev - fun:_Z14testQueueQueryv - fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv - obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0 - fun:_ZN5boost17execution_monitor7executeEbi - fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi - fun:_ZN5boost9unit_test9test_case3runEv - fun:_ZN5boost9unit_test10test_suite6do_runEv - fun:_ZN5boost9unit_test9test_case3runEv - fun:main -} - -{ - INVESTIGATE - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.2.5 - fun:_ZN4qpid6client9Connector4initEv -} - -{ - MICK -- FIX - Memcheck:Leak - fun:_Znam - fun:_ZN4qpid7Options5parseEiPPcRKSsb -} - -{ - MICK -- FIX - Memcheck:Leak - fun:malloc - fun:strdup - fun:_ZN4qpid7Options5parseEiPPcRKSsb -} - diff --git a/cpp/src/tests/.valgrindrc b/cpp/src/tests/.valgrindrc deleted file mode 100644 index 76bac021d8..0000000000 --- a/cpp/src/tests/.valgrindrc +++ /dev/null @@ -1,8 +0,0 @@ ---gen-suppressions=all ---leak-check=full ---demangle=yes ---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 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.suppress b/cpp/src/tests/valgrind.suppress new file mode 100644 index 0000000000..bffde9d815 --- /dev/null +++ b/cpp/src/tests/valgrind.suppress @@ -0,0 +1,194 @@ +{ + Benign error in libcpg. + Memcheck:Param + socketcall.sendmsg(msg.msg_iov[i]) + obj:*/libpthread-2.5.so + obj:*/libcpg.so.2.0.0 +} + +{ + Uninitialised value problem in _dl_relocate (F7, F8) + Memcheck:Cond + fun:_dl_relocate_object + fun:*dl_* +} + +{ + False "possibly leaked" in boost program_options - global std::string var. + Memcheck:Leak + fun:_Znwj + fun:_ZNSs4_Rep9_S_createEjjRKSaIcE + obj:/usr/lib/libstdc++.so.6.0.8 + fun:_ZNSsC1EPKcRKSaIcE + obj:/usr/lib/libboost_program_options.so.1.33.1 +} + +{ + Bogus epoll_ctl error on i386 + Memcheck:Param + epoll_ctl(event) + fun:epoll_ctl +} + +{ + boost 103200 -- we think Boost is responsible for these leaks. + Memcheck:Leak + fun:_Znwm + fun:_ZN5boost15program_options??options_description* +} + +{ + boost 103200 -- we think Boost is responsible for these leaks. + Memcheck:Leak + fun:_Znwm + fun:_ZN5boost9unit_test9test_case* +} + +{ + boost 103200 -- we think Boost is responsible for these leaks. + Memcheck:Leak + fun:calloc + fun:_dlerror_run + fun:dlopen@@GLIBC_2.2.5 + fun:_ZN4qpid3sys5Shlib4loadEPKc + fun:_Z9testShlibv + fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv + obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0 + fun:_ZN5boost17execution_monitor7executeEbi + fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi + fun:_ZN5boost9unit_test9test_case3runEv + fun:_ZN5boost9unit_test10test_suite6do_runEv + fun:_ZN5boost9unit_test9test_case3runEv + fun:main +} + +{ + boost 103200 -- we think Boost is responsible for these leaks. + Memcheck:Leak + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_ZN4qpid6broker5Timer5startEv + fun:_ZN4qpid6broker5TimerC1Ev + fun:_ZN4qpid6broker10DtxManagerC1Ev + fun:_ZN4qpid6broker6BrokerC1ERKNS1_7OptionsE + fun:_ZN4qpid6broker6Broker6createERKNS1_7OptionsE + fun:_ZN15SessionFixtureTI15ProxyConnectionEC2Ev + fun:_Z14testQueueQueryv + fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv + obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0 + fun:_ZN5boost17execution_monitor7executeEbi + fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi + fun:_ZN5boost9unit_test9test_case3runEv + fun:_ZN5boost9unit_test10test_suite6do_runEv + fun:_ZN5boost9unit_test9test_case3runEv + fun:main +} + +{ + INVESTIGATE + Memcheck:Leak + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_ZN4qpid6client9Connector4initEv + fun:_ZN4qpid6client14ConnectionImpl4openERKSsiS3_S3_S3_ +} + +{ + INVESTIGATE + Memcheck:Param + write(buf) + obj:/lib64/tls/libc-2.3.4.so + fun:_ZNK4qpid3sys6Socket5writeEPKvm + fun:_ZN4qpid3sys8AsynchIO9writeableERNS0_14DispatchHandleE +} + +{ + "Conditional jump or move depends on uninitialised value(s)" from Xerces parser + Memcheck:Cond + fun:_ZN11xercesc_2_717XMLUTF8Transcoder13transcodeFromEPKhjPtjRjPh + fun:_ZN11xercesc_2_79XMLReader14xcodeMoreCharsEPtPhj + fun:_ZN11xercesc_2_79XMLReader17refreshCharBufferEv +} + +{ + boost 103200 -- mgoulish -- fix this, sometime + Memcheck:Leak + fun:* + fun:* + obj:* + fun:* + fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_ +} + +{ + boost 103200 -- mgoulish -- fix this, sometime + Memcheck:Leak + fun:* + fun:* + fun:* + fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_ +} + +{ + INVESTIGATE + Memcheck:Param + socketcall.sendto(msg) + fun:send + fun:get_mapping + fun:__nscd_get_map_ref + fun:nscd_gethst_r + fun:__nscd_gethostbyname_r + fun:gethostbyname_r@@GLIBC_2.2.5 + fun:gethostbyname + fun:_ZNK4qpid3sys6Socket7connectERKSsi +} + +{ + INVESTIGATE + Memcheck:Leak + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_ZN4qpid6broker5Timer5startEv + fun:_ZN4qpid6broker5TimerC1Ev + fun:_ZN4qpid6broker10DtxManagerC1Ev + fun:_ZN4qpid6broker6BrokerC1ERKNS1_7OptionsE + fun:_ZN4qpid6broker6Broker6createERKNS1_7OptionsE + fun:_ZN20ClientSessionFixtureC1Ev + fun:_Z14testQueueQueryv + fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv + obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0 + fun:_ZN5boost17execution_monitor7executeEbi + fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi + fun:_ZN5boost9unit_test9test_case3runEv + fun:_ZN5boost9unit_test10test_suite6do_runEv + fun:_ZN5boost9unit_test9test_case3runEv + fun:main +} + +{ + INVESTIGATE + Memcheck:Leak + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_ZN4qpid6client9Connector4initEv +} + +{ + MICK -- FIX + Memcheck:Leak + fun:_Znam + fun:_ZN4qpid7Options5parseEiPPcRKSsb +} + +{ + MICK -- FIX + Memcheck:Leak + fun:malloc + fun:strdup + fun:_ZN4qpid7Options5parseEiPPcRKSsb +} + diff --git a/cpp/src/tests/valgrindrc b/cpp/src/tests/valgrindrc new file mode 100644 index 0000000000..da0c2c9aca --- /dev/null +++ b/cpp/src/tests/valgrindrc @@ -0,0 +1,8 @@ +--gen-suppressions=all +--leak-check=full +--demangle=yes +--suppressions=.valgrind.suppress +--num-callers=25 +--trace-children=yes +--error-exitcode=1 + -- cgit v1.2.1