From 6a7e37c99f733821bd3a17432fa6e4591b63866c Mon Sep 17 00:00:00 2001
From: Jeff King <peff@peff.net>
Date: Wed, 4 Feb 2009 00:26:03 +0100
Subject: [PATCH] valgrind: ignore ldso and more libz errors

On some Linux systems, we get a host of Cond and Addr errors
from calls to dlopen that are caused by nss modules. We
should be able to safely ignore anything happening in
ld-*.so as "not our problem."

[Johannes: I added some more... unfortunately using valgrind 3.4.0 syntax]

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/valgrind/default.supp | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/t/valgrind/default.supp b/t/valgrind/default.supp
index 2482b3b06a..5f341b8598 100644
--- a/t/valgrind/default.supp
+++ b/t/valgrind/default.supp
@@ -4,6 +4,12 @@
 	obj:*libz.so*
 }
 
+{
+	ignore-zlib-errors-value8
+	Memcheck:Value8
+	obj:*libz.so*
+}
+
 {
 	ignore-zlib-errors-value4
 	Memcheck:Value4
@@ -11,11 +17,27 @@
 }
 
 {
-	writing-data-from-zlib-triggers-errors
+	ignore-ldso-cond
+	Memcheck:Cond
+	obj:*ld-*.so
+}
+
+{
+	ignore-ldso-addr8
+	Memcheck:Addr8
+	obj:*ld-*.so
+}
+
+{
+	ignore-ldso-addr4
+	Memcheck:Addr4
+	obj:*ld-*.so
+}
+
+{
+	writing-data-from-zlib-triggers-even-more-errors
 	Memcheck:Param
 	write(buf)
-	obj:/lib/ld-*.so
-	fun:write_in_full
-	fun:write_buffer
+	...
 	fun:write_loose_object
 }