[telepathy-mission-control/master] Loosen some matches in valgrind.supp using the "..." wildcard

[Simon McVittie]

---
 test/twisted/tools/valgrind.supp |  147 ++++----------------------------------
 1 files changed, 14 insertions(+), 133 deletions(-)

diff --git a/test/twisted/tools/valgrind.supp b/test/twisted/tools/valgrind.supp
index de22f1c..1a87dd3 100644
--- a/test/twisted/tools/valgrind.supp
+++ b/test/twisted/tools/valgrind.supp
@@ -10,7 +10,7 @@
 {
    libdbus shared connection via tp_get_bus (1)
    Memcheck:Leak
-   fun:malloc
+   ...
    fun:dbus_malloc
    obj:*/libdbus-1.so.*
    obj:*/libdbus-1.so.*
@@ -21,7 +21,7 @@
 {
    libdbus shared connection via tp_dbus_daemon_dup (1)
    Memcheck:Leak
-   fun:malloc
+   ...
    fun:dbus_malloc
    obj:*/libdbus-1.so.*
    obj:*/libdbus-1.so.*
@@ -32,7 +32,7 @@
 {
    libdbus shared connection via tp_get_bus (2)
    Memcheck:Leak
-   fun:calloc
+   ...
    fun:dbus_malloc0
    obj:*/libdbus-1.so.*
    obj:*/libdbus-1.so.*
@@ -48,7 +48,7 @@
 {
    libdbus shared connection via tp_dbus_daemon_dup (2)
    Memcheck:Leak
-   fun:calloc
+   ...
    fun:dbus_malloc0
    obj:*/libdbus-1.so.*
    obj:*/libdbus-1.so.*
@@ -64,7 +64,7 @@
 {
    libdbus shared connection via tp_get_bus (3)
    Memcheck:Leak
-   fun:realloc
+   ...
    fun:dbus_realloc
    obj:*/libdbus-1.so.*
    obj:*/libdbus-1.so.*
@@ -84,7 +84,7 @@
 {
    libdbus shared connection via tp_dbus_daemon_dup (3)
    Memcheck:Leak
-   fun:realloc
+   ...
    fun:dbus_realloc
    obj:*/libdbus-1.so.*
    obj:*/libdbus-1.so.*
@@ -454,75 +454,20 @@
 }
 
 {
-   g_type_init cruft (1)
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   obj:/usr/lib/libgobject-2.0.so.*
-   obj:/usr/lib/libgobject-2.0.so.*
-   fun:g_type_init_with_debug_flags
-   fun:g_type_init
-   fun:main
-}
-
-{
-   g_type_init cruft (1), 2.16 version
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   obj:/usr/lib/libgobject-2.0.so.*
-   obj:/usr/lib/libgobject-2.0.so.*
-   fun:g_type_init_with_debug_flags
-   fun:g_type_init
-   fun:main
-}
-
-{
-   g_type_init cruft (3)
+   anything called by g_type_init_with_debug_flags
    Memcheck:Leak
-   fun:realloc
-   fun:g_realloc
-   obj:/usr/lib/libgobject-2.0.so.*
-   obj:/usr/lib/libgobject-2.0.so.*
-   fun:g_type_register_static
-   fun:g_param_type_register_static
-   obj:/usr/lib/libgobject-2.0.so.*
+   ...
    fun:g_type_init_with_debug_flags
-   fun:g_type_init
 }
 
 {
-   g_type_init cruft (4)
+   static GType registration
    Memcheck:Leak
-   fun:realloc
+   ...
    fun:g_realloc
-   fun:g_boxed_type_register_static
-   fun:g_value_array_get_type
-   fun:g_param_spec_types_init
-   fun:g_type_init_with_debug_flags
-   fun:g_type_init
-}
-
-{
-   g_type_init cruft (5)
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
    obj:/usr/lib/libgobject-2.0.so.*
    obj:/usr/lib/libgobject-2.0.so.*
-   fun:g_type_init_with_debug_flags
-}
-
-{
-   g_type_init cruft (6)
-   Memcheck:Leak
-   fun:realloc
-   fun:g_realloc
-   obj:/usr/lib/libgobject-2.0.so.*
    fun:g_type_register_static
-   fun:g_param_type_register_static
-   obj:/usr/lib/libgobject-2.0.so.*
-   fun:g_type_init_with_debug_flags
 }
 
 {
@@ -584,42 +529,7 @@
 {
    GQuarks can't be freed
    Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   fun:g_quark_from_static_string
-}
-
-{
-   GQuark admin
-   Memcheck:Leak
-   fun:memalign
-   fun:posix_memalign
-   fun:slab_allocator_alloc_chunk
-   fun:g_slice_alloc
-   fun:g_hash_table_new_full
-   fun:g_hash_table_new
-   fun:g_quark_from_static_string
-}
-
-{
-   GQuark admin (with G_SLICE_DEBUG=always-malloc)
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_hash_table_new_full
-   fun:g_hash_table_new
-   fun:g_quark_from_static_string
-}
-
-{
-   GQuark admin (with G_SLICE_DEBUG=always-malloc and a slightly different glib than above)
-   Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_slice_alloc
-   fun:g_hash_table_new_full
+   ...
    fun:g_quark_from_static_string
 }
 
@@ -831,24 +741,16 @@
 {
    GTest initialization
    Memcheck:Leak
-   fun:malloc
-   fun:g_malloc
-   fun:g_strdup
-   fun:g_set_prgname
+   ...
    fun:g_test_init
-   fun:main
 }
 
 {
-   GTest initialization
+   g_random_int makes default GRand
    Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_rand_new_with_seed_array
+   ...
    fun:g_rand_new
    fun:g_random_int
-   fun:g_test_init
-   fun:main
 }
 
 {
@@ -905,24 +807,3 @@
    fun:mcd_service_new
    fun:main
 }
-
-{
-   static GType registration
-   Memcheck:Leak
-   fun:realloc
-   fun:g_realloc
-   obj:*/libglib2.0-0.so.*
-   obj:*/libglib2.0-0.so.*
-   fun:g_type_register_static
-}
-
-{
-   static GType registration
-   Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   obj:*/libglib2.0-0.so.*
-   obj:*/libglib2.0-0.so.*
-   fun:g_type_register_static
-}
-- 
1.5.6.5