From dec151d15512e4cca2dcdd36d9c6c4a2185760ec Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 9 Mar 2007 18:47:30 +0000 Subject: [PATCH] check.mak: Use the same timeout when generating valgrind suppressions as running the valgrind test. Original commit message from CVS: * check.mak: Use the same timeout when generating valgrind suppressions as running the valgrind test. * gst.supp: Add some more suppressions and stuff. --- ChangeLog | 9 ++++++ check.mak | 2 +- gst.supp | 96 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 85 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8f7385..1cf8494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-03-09 Jan Schmidt + + * check.mak: + Use the same timeout when generating valgrind suppressions as + running the valgrind test. + + * gst.supp: + Add some more suppressions and stuff. + 2007-03-08 Jan Schmidt * check.mak: diff --git a/check.mak b/check.mak index f869f82..9ac509d 100644 --- a/check.mak +++ b/check.mak @@ -59,7 +59,7 @@ LOOPS = 10 # valgrind any given test and generate suppressions for it %.valgrind.gen-suppressions: % $(TESTS_ENVIRONMENT) \ - CK_DEFAULT_TIMEOUT=60 \ + CK_DEFAULT_TIMEOUT=360 \ G_SLICE=always-malloc \ libtool --mode=execute \ $(VALGRIND_PATH) -q \ diff --git a/gst.supp b/gst.supp index 4831f93..ac8eb6d 100644 --- a/gst.supp +++ b/gst.supp @@ -1330,25 +1330,6 @@ Memcheck:Leak fun:calloc fun:g_malloc0 - fun:ORBit_alloc_tcval - fun:ORBit_adaptor_setup - obj:/usr/lib/libORBit-2.so.* - fun:ORBit_POA_setup_root - fun:ORBit_init_internals - fun:CORBA_ORB_init - fun:gconf_orb_get - obj:/usr/lib/libgconf-2.so.* - fun:gconf_get_current_lock_holder - fun:gconf_activate_server - obj:/usr/lib/libgconf-2.so.* - obj:/usr/lib/libgconf-2.so.* - fun:gconf_engine_get_default -} -{ - - Memcheck:Leak - fun:calloc - fun:g_malloc0 fun:ORBit_alloc* obj:/usr/lib/libORBit-2.so.* fun:ORBit_demarshal_IOR @@ -1444,8 +1425,18 @@ fun:ORBit_POA_setup_root fun:ORBit_init_internals fun:CORBA_ORB_init - fun:bonobo_activation_orb_init - fun:bonobo_activation_init +} +{ + + Memcheck:Leak + fun:calloc + fun:g_malloc0 + fun:ORBit_alloc_tcval + fun:ORBit_adaptor_setup + obj:/usr/lib/libORBit-2.so* + fun:ORBit_POA_setup_root + fun:ORBit_init_internals + fun:CORBA_ORB_init } { @@ -1581,3 +1572,66 @@ fun:g_get_any_init_do fun:g_get_home_dir } +{ + + Memcheck:Leak + fun:malloc + obj:/lib/libc-*.so + fun:__nss_database_lookup + obj:* + obj:* + fun:getpwnam_r + fun:g_get_any_init_do + fun:g_get_user_name +} + +## Some Fontconfig errors. +{ + + Memcheck:Leak + fun:malloc + fun:FcPatternObjectInsertElt + fun:FcPatternObjectAddWithBinding + fun:FcPatternAppend + fun:FcEndElement + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + fun:XML_ParseBuffer + fun:FcConfigParseAndLoad + fun:FcConfigParseAndLoad + fun:FcParseInclude + fun:FcEndElement + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + fun:XML_ParseBuffer + fun:FcConfigParseAndLoad +} +{ + + Memcheck:Leak + fun:malloc + fun:FcStrCopy + fun:FcEndElement + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + fun:XML_ParseBuffer + fun:FcConfigParseAndLoad + fun:FcConfigParseAndLoad + fun:FcParseInclude + fun:FcEndElement + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + obj:/usr/lib/libexpat.so.1.0.0 + fun:XML_ParseBuffer + fun:FcConfigParseAndLoad + fun:FcInitLoadConfig + fun:FcInitLoadConfigAndFonts +} + -- 2.7.4