From 3109d2bffa52eb43725d7f98761ad37bf91dbb8c Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 2 May 2011 16:54:04 -0600
Subject: [PATCH] tests: suppress more valgrind situations

* tests/.valgrind.supp: Consolidate bash suppressions.  Ignore
more libnl issues.
---
 tests/.valgrind.supp | 72 +++++---------------------------------------
 1 file changed, 8 insertions(+), 64 deletions(-)

diff --git a/tests/.valgrind.supp b/tests/.valgrind.supp
index 68cfa0ce41..71901032cf 100644
--- a/tests/.valgrind.supp
+++ b/tests/.valgrind.supp
@@ -3,15 +3,7 @@
    Memcheck:Leak
    fun:malloc
    fun:xmalloc
-   fun:set_signal
-   fun:trap_builtin
-   obj:/bin/bash
-   obj:/bin/bash
-   fun:execute_command_internal
-   fun:parse_and_execute
-   obj:/bin/bash
-   fun:source_file
-   fun:source_builtin
+   ...
    obj:/bin/bash
 }
 {
@@ -19,61 +11,6 @@
    Memcheck:Leak
    fun:malloc
    fun:xmalloc
-   fun:make_command
-   fun:yyparse
-   fun:parse_command
-   fun:read_command
-   fun:reader_loop
-   fun:main
-}
-{
-   bashMemoryLeak3
-   Memcheck:Leak
-   fun:malloc
-   fun:xmalloc
-   obj:/bin/bash
-   fun:execute_command_internal
-   obj:/bin/bash
-   fun:execute_command_internal
-   fun:execute_command_internal
-   obj:/bin/bash
-   obj:/bin/bash
-   fun:execute_command_internal
-   fun:parse_and_execute
-   fun:command_substitute
-}
-{
-   bashMemoryLeak4
-   Memcheck:Leak
-   fun:malloc
-   fun:xmalloc
-   fun:make_bare_simple_command
-   fun:make_simple_command
-   fun:yyparse
-   fun:parse_command
-   fun:read_command
-   fun:reader_loop
-   fun:main
-}
-{
-   bashMemoryLeak5
-   Memcheck:Leak
-   fun:malloc
-   fun:xmalloc
-   fun:set_signal
-   fun:trap_builtin
-   obj:/bin/bash
-   obj:/bin/bash
-   fun:execute_command_internal
-   fun:execute_command
-   fun:reader_loop
-   fun:main
-}
-{
-   bashMemoryLeak6
-   Memcheck:Leak
-   fun:malloc
-   fun:xmalloc
    fun:make_bare_simple_command
    fun:make_simple_command
    fun:yyparse
@@ -277,6 +214,13 @@
    fun:calloc
    obj:/usr/lib/libnl.so.1.1
 }
+{
+   libnlMemoryLeak3
+   Memcheck:Leak
+   fun:?alloc
+   ...
+   obj:/lib64/libnl.so.1.1
+}
 {
    libselinuxMemoryLeak1
    Memcheck:Leak