[gnumeric] tests: we no longer need to separate "..." suppressions.

[Morten Welinder <mortenw src gnome org>]

commit 3e7978f69e492e718657c6271749af3e7fbf0e13
Author: Morten Welinder <terra gnome org>
Date:   Thu Jan 10 20:39:24 2013 -0500

    tests: we no longer need to separate "..." suppressions.

 test/ChangeLog       |    7 +
 test/GnumericTest.pm |    6 +-
 test/Makefile.am     |    2 +-
 test/common.supp     |  346 ++++++++++++++++++++++++++++++++++++++++++++++++++
 test/commondots.supp |  345 -------------------------------------------------
 5 files changed, 355 insertions(+), 351 deletions(-)
---
diff --git a/test/ChangeLog b/test/ChangeLog
index 36fea87..26e0c22 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-10  Morten Welinder  <terra gnome org>
+
+	* GnumericTest.pm (test_valgrind): Skip unless we have Valgrind
+	new enough to understand "..." suppressions.  Not new at all.
+
+	* commondots.supp: Merge into common.supp
+
 2012-12-18  Morten Welinder <terra gnome org>
 
 	* Release 1.12.0
diff --git a/test/GnumericTest.pm b/test/GnumericTest.pm
index a7a630f..9d5ea57 100644
--- a/test/GnumericTest.pm
+++ b/test/GnumericTest.pm
@@ -375,6 +375,7 @@ sub test_valgrind {
     die "Problem running valgrind.\n"
 	unless $valvers =~ /^valgrind-(\d+)\.(\d+)\.(\d+)$/;
     $valvers = $1 * 10000 + $2 * 100 + $3;
+    &report_skip ("Valgrind is too old") unless $valvers >= 30500;
 
     $cmd = "--gen-suppressions=all $cmd";
 
@@ -384,11 +385,6 @@ sub test_valgrind {
 	$cmd = "--suppressions=$suppfile $cmd" if -r $suppfile;
     }
 
-    if ($valvers >= 30500) {
-	my $suppfile = "$topsrc/test/commondots.supp";
-	$cmd = "--suppressions=$suppfile $cmd" if -r $suppfile;
-    }
-
     {
 	my $suppfile = $0;
 	$suppfile =~ s/\.pl$/.supp/;
diff --git a/test/Makefile.am b/test/Makefile.am
index 03b22a9..6b7ee15 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,7 +26,7 @@
 # 90xx: Misc stuff.
 
 TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
-SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp
+SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp
 
 import-db:
 	for t in $(srcdir)/t5[0-9][0-9][0-9]-*.pl; do echo "*** $$t ***"; $(PERL) $$t create-db; done
diff --git a/test/common.supp b/test/common.supp
index 3e03b46..0a93bcd 100644
--- a/test/common.supp
+++ b/test/common.supp
@@ -330,3 +330,349 @@
    fun:calloc
    fun:allocate_dtv
 }
+
+{
+   Leak/pango_layout_check_lines
+   Memcheck:Leak
+   ...
+   fun:pango_layout_check_lines
+}
+
+{
+   Leak/_cairo_scaled_glyph_lookup
+   Memcheck:Leak
+   ...
+   fun:_cairo_scaled_glyph_lookup
+}
+
+{
+   Leak/cairo_show_glyphs
+   Memcheck:Leak
+   ...
+   fun:cairo_show_glyphs
+}
+
+{
+   Leak/g_type_register_fundamental
+   Memcheck:Leak
+   ...
+   fun:g_type_register_fundamental
+}
+
+{
+   Leak/g_type_register_static
+   Memcheck:Leak
+   ...
+   fun:g_type_register_static
+}
+
+{
+   Leak/g_type_add_interface_static
+   Memcheck:Leak
+   ...
+   fun:g_type_add_interface_static
+}
+
+{
+   Leak/g_type_add_interface_dynamic
+   Memcheck:Leak
+   ...
+   fun:g_type_add_interface_dynamic
+}
+
+{
+   Leak/g_type_register_dynamic
+   Memcheck:Leak
+   ...
+   fun:g_type_register_dynamic
+}
+
+{
+   Leak/g_type_init
+   Memcheck:Leak
+   ...
+   fun:g_type_init
+}
+
+{
+   Leak/g_type_init_with_debug_flags
+   Memcheck:Leak
+   ...
+   fun:g_type_init_with_debug_flags
+}
+
+
+{
+   Leak/g_bookmark_file_load_from_data
+   Memcheck:Leak
+   ...
+   fun:g_bookmark_file_load_from_data
+}
+
+# Probably not leaked, but cached.
+{
+   Leak/pango_ot_ruleset_...
+   Memcheck:Leak
+   ...
+   fun:pango_ot_ruleset_*
+}
+
+{
+   glibc_write_fseeko64
+   Memcheck:Param
+   write(buf)
+   ...
+   fun:fseeko64
+}
+
+{
+   Leak/gconf_engine_get_default
+   Memcheck:Leak
+   ...
+   fun:gconf_engine_get_default
+}
+
+{
+   Leak/dlopen_dots
+   Memcheck:Leak
+   ...
+   fun:dlopen*
+}
+
+{
+   Leak/gtk_recent_manager_set_property
+   Memcheck:Leak
+   ...
+   fun:gtk_recent_manager_set_property
+}
+
+{
+   Leak/FcInit
+   Memcheck:Leak
+   ...
+   fun:FcInit
+}
+
+{
+   Leak/FcConfigParseAndLoad
+   Memcheck:Leak
+   ...
+   fun:FcConfigParseAndLoad
+}
+
+{
+   Leak/type_iface_vtable_base_init_Wm
+   Memcheck:Leak
+   ...
+   fun:type_iface_vtable_base_init_Wm
+}
+
+{
+   Leak/FcFontRenderPrepare1
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:FcFontRenderPrepare
+}
+
+{
+   Leak/FcFontRenderPrepare2
+   Memcheck:Leak
+   fun:realloc
+   ...
+   fun:FcFontRenderPrepare
+}
+
+{
+   Leak/FcDefaultSubstitute1
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:FcDefaultSubstitute
+}
+
+{
+   Leak/FcDefaultSubstitute2
+   Memcheck:Leak
+   fun:realloc
+   ...
+   fun:FcDefaultSubstitute
+}
+
+{
+   getpwuid_r
+   Memcheck:Addr4
+   ...
+   fun:getpwuid_r
+}
+
+{
+   Leak/getpwuid_r
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:getpwuid_r
+}
+
+{
+   Leak/pango_language_get_default
+   Memcheck:Leak
+   ...
+   fun:pango_language_get_default
+}
+
+{
+   gconf_activate_server
+   Memcheck:Param
+   writev(vector[...])
+   ...
+   fun:gconf_activate_server
+}
+
+{
+   dlopen
+   Memcheck:Addr4
+   ...
+   fun:dlopen   
+}
+
+{
+   Leak/Mystery-fontconfig
+   Memcheck:Leak
+   fun:malloc
+   obj:*libfontconfig.so*
+   ...
+   obj:*libpangoft2-*.so*
+   fun:style_font_new_simple
+}
+
+{
+   Leak/FT_Open_Face1
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:FT_Open_Face
+}
+
+{
+   Leak/FT_Open_Face2
+   Memcheck:Leak
+   fun:realloc
+   ...
+   fun:FT_Open_Face
+}
+
+{
+   Leak/FT_Init_FreeType
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:FT_Init_FreeType
+}
+
+{
+   Leak/fontconfig
+   Memcheck:Leak
+   fun:malloc
+   fun:FcConfigValues
+}
+
+{
+   Leak/FcConfigSubstituteWithPat
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:FcConfigSubstituteWithPat
+}
+
+{
+   Leak/g_type_class_ref1
+   Memcheck:Leak
+   fun:malloc
+   ...
+   fun:g_type_class_ref
+}
+
+{
+   Leak/g_type_class_ref2
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:g_type_class_ref
+}
+
+{
+   GIO/OpenSuSE11.4/FMR
+   Memcheck:Addr4
+   fun:g_atomic_int_exchange_and_add
+   fun:g_variant_unref
+   ...
+   fun:g_settings_backend_get_default
+}
+
+{
+   GIO/OpenSuSE11.4/MLK
+   Memcheck:Leak
+   fun:calloc
+   ...
+   fun:g_file_monitor_file
+}
+
+{
+   GLIBC/thread1/MLK
+   Memcheck:Leak
+   ...
+   fun:g_system_thread_new
+}
+
+{
+   GLIBC/thread2/MLK
+   Memcheck:Leak
+   ...
+   fun:g_thread_new
+}
+
+{
+   GLIB/closure1/MLK
+   Memcheck:Leak
+   ...
+   fun:g_signal_connect_object
+   fun:gnm_app_init
+}
+
+{
+   Leak/gtk_recent_manager_get_default
+   Memcheck:Leak
+   ...
+   fun:g_object_new
+   fun:gtk_recent_manager_get_default
+}
+
+{
+   GLIBC/ABR/over-eager-memcpy
+   Memcheck:Addr4
+   fun:find_name
+   fun:_cairo_truetype_read_font_name
+}
+
+{
+   GLIBC/COND/wcslen
+   Memcheck:Addr8
+   fun:wcslen
+   ...
+   fun:g_utf8_collate_key
+}
+
+{
+   GLIBC/MLK/nss_parse_service_list
+   Memcheck:Leak
+   fun:malloc
+   fun:nss_parse_service_list
+}
+
+{
+   GLIBC/COND/strtod
+   Memcheck:Addr8
+   fun:__GI___strncasecmp_l
+   fun:____strtod_l_internal
+}