Fix mods to suppressions; changed from patching to cat'ing to the end for easier management.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@692250 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 108 insertions, 122 deletions

diff --git a/qpid/cpp/boost-1.32-support/Makefile b/qpid/cpp/boost-1.32-support/Makefile
index fb440e26da..f0907f7fda 100644
--- a/qpid/cpp/boost-1.32-support/Makefile
+++ b/qpid/cpp/boost-1.32-support/Makefile
@@ -5,6 +5,7 @@ default:
 
 apply: main.patch ../src/boost
 	patch -d .. -p0 < main.patch
+	cat supressions >> ../src/tests/.valgrind.supp
 
 ../src/boost: boost.tar.gz
 	tar -C .. -xvzf boost.tar.gz
diff --git a/qpid/cpp/boost-1.32-support/main.patch b/qpid/cpp/boost-1.32-support/main.patch
index 0d1e1e9d0a..e89ceeb611 100644
--- a/qpid/cpp/boost-1.32-support/main.patch
+++ b/qpid/cpp/boost-1.32-support/main.patch
@@ -10,128 +10,6 @@ Index: configure.ac
  	    gl_COMPILER_FLAGS(-pedantic)
  	    gl_COMPILER_FLAGS(-Wall)
  	    gl_COMPILER_FLAGS(-Wextra)
-Index: src/tests/.valgrind.supp
-===================================================================
---- src/tests/.valgrind.supp	(revision 685281)
-+++ src/tests/.valgrind.supp	(working copy)
-@@ -193,8 +193,116 @@
- }
- 
- {
--  CPG related errors - seem benign but should invesgitate.
-+   similar to other param error, below.
-    Memcheck:Param
-+   socketcall.sendto(msg)
-+   fun:send
-+   fun:get_mapping
-+}
-+
-+{
-+   RHEL4 -- we think Boost is responsible for these leaks.
-+   Memcheck:Leak
-+   fun:_Znwm
-+   fun:_ZN5boost15program_options??options_description*
-+}
-+
-+{
-+   RHEL4 -- we think Boost is responsible for these leaks.
-+   Memcheck:Leak
-+   fun:_Znwm
-+   fun:_ZN5boost9unit_test9test_case*
-+}
-+
-+{
-+   RHEL4 -- 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
-+}
-+
-+{
-+   RHEL4 -- 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
-+}
-+
-+{
-+   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
-+}
-+
-+{
-+   INVESTIGATE
-+   Memcheck:Leak
-+   fun:calloc
-+   fun:_dl_allocate_tls
-+   fun:pthread_create@@GLIBC_2.2.5
-+   fun:_ZN4qpid6broker5Timer5startEv
-+   fun:_ZN4qpid6broker5TimerC1Ev
-+   fun:_ZN4qpid6broker10DtxManagerC1Ev
-+}
-+{
-+   RHEL4 (and FC5)
-+   Memcheck:Leak 
-+   fun:calloc
-+   fun:_dl_allocate_tls
-+   fun:pthread_create@@GLIBC_2.2.5
-+   fun:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
-+   fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
-+   fun:_ZN4qpid6client9Connector4initEv
-+}
-+{
-+   INVESTIGATE
-+   Memcheck:Param
-+   futex(utime)
-+   fun:__lll_mutex_unlock_wake
-+}
-+{
-+   SAME ISSUE, NEW OCCURENCE
-+   Memcheck:Leak
-+   fun:calloc
-+   fun:_dl_allocate_tls
-+   fun:pthread_create@@GLIBC_2.2.5
-+   fun:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
-+   fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
-+   fun:_ZN4qpid6broker5Timer5startEv
-+   fun:_ZN4qpid6broker5TimerC1Ev
-+   fun:_ZN4qpid6broker12LinkRegistryC1EPNS0_6BrokerE
-+}
-+{
-+   CPG related errors - seem benign but should invesgitate.
-+   Memcheck:Param
-    socketcall.sendmsg(msg.msg_iov[i])
-    fun:sendmsg
-    obj:/usr/lib/openais/libcpg.so.2.0.0
 Index: src/Makefile.am
 ===================================================================
 --- src/Makefile.am	(revision 685281)
diff --git a/qpid/cpp/boost-1.32-support/supressions b/qpid/cpp/boost-1.32-support/supressions
new file mode 100644
index 0000000000..5b5c81036b
--- /dev/null
+++ b/qpid/cpp/boost-1.32-support/supressions
@@ -0,0 +1,107 @@
+{
+   RHEL4 -- we think Boost is responsible for these leaks.
+   Memcheck:Leak
+   fun:_Znwm
+   fun:_ZN5boost15program_options??options_description*
+}
+
+{
+   RHEL4 -- we think Boost is responsible for these leaks.
+   Memcheck:Leak
+   fun:_Znwm
+   fun:_ZN5boost9unit_test9test_case*
+}
+
+{
+   RHEL4 -- 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
+}
+
+{
+   RHEL4 -- 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
+}
+
+{
+   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
+}
+
+{
+   INVESTIGATE
+   Memcheck:Leak
+   fun:calloc
+   fun:_dl_allocate_tls
+   fun:pthread_create@@GLIBC_2.2.5
+   fun:_ZN4qpid6broker5Timer5startEv
+   fun:_ZN4qpid6broker5TimerC1Ev
+   fun:_ZN4qpid6broker10DtxManagerC1Ev
+}
+{
+   RHEL4 (and FC5)
+   Memcheck:Leak 
+   fun:calloc
+   fun:_dl_allocate_tls
+   fun:pthread_create@@GLIBC_2.2.5
+   fun:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
+   fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
+   fun:_ZN4qpid6client9Connector4initEv
+}
+{
+   INVESTIGATE
+   Memcheck:Param
+   futex(utime)
+   fun:__lll_mutex_unlock_wake
+}
+{
+   SAME ISSUE, NEW OCCURENCE
+   Memcheck:Leak
+   fun:calloc
+   fun:_dl_allocate_tls
+   fun:pthread_create@@GLIBC_2.2.5
+   fun:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
+   fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
+   fun:_ZN4qpid6broker5Timer5startEv
+   fun:_ZN4qpid6broker5TimerC1Ev
+   fun:_ZN4qpid6broker12LinkRegistryC1EPNS0_6BrokerE
+}
+{
+   <insert a suppression name here>
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:send
+   fun:get_mapping
+}