From 91085b87fcce17fa1148b9925cdfc26302c842c5 Mon Sep 17 00:00:00 2001
From: nick <nick@bytemark.co.uk>
Date: Fri, 15 Feb 2013 13:35:21 +0000
Subject: [PATCH] flexnbd: Add valgrind suppressions for a bug in glibc-2.11

---
 tests/acceptance/custom.supp | 13 +++++++++++++
 tests/acceptance/flexnbd.rb  |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 tests/acceptance/custom.supp

diff --git a/tests/acceptance/custom.supp b/tests/acceptance/custom.supp
new file mode 100644
index 0000000..faf8d91
--- /dev/null
+++ b/tests/acceptance/custom.supp
@@ -0,0 +1,13 @@
+{
+   avoid_glibc_bug_do_lookup
+   Memcheck:Addr8
+   fun:do_lookup_x
+   obj:*
+   fun:_dl_lookup_symbol_x
+}
+{
+   avoid_glibc_bug_check_match
+   Memcheck:Addr8
+   fun:check_match.12149
+}
+
diff --git a/tests/acceptance/flexnbd.rb b/tests/acceptance/flexnbd.rb
index e66ae75..d018144 100644
--- a/tests/acceptance/flexnbd.rb
+++ b/tests/acceptance/flexnbd.rb
@@ -21,7 +21,7 @@ class ValgrindExecutor
   attr_reader :pid
 
   def run( cmd )
-    @pid = fork do exec "valgrind --track-origins=yes #{cmd}" end
+    @pid = fork do exec "valgrind --track-origins=yes --suppressions=custom.supp #{cmd}" end
   end
 end # class ValgrindExecutor
 
@@ -131,7 +131,7 @@ class ValgrindKillingExecutor
 
   def run( cmd )
     @io_r, io_w = IO.pipe
-    @pid = fork do exec( "valgrind --xml=yes --xml-fd=#{io_w.fileno} " + cmd ) end
+    @pid = fork do exec( "valgrind --suppressions=custom.supp --xml=yes --xml-fd=#{io_w.fileno} " + cmd ) end
     launch_watch_thread( @pid, @io_r )
     @pid
   end
@@ -521,3 +521,4 @@ module FlexNBD
   end
 
 end
+