[gjs/april-maintenance: 8/14] CI: Update some Valgrind suppression expressions

[Philip Chimento <pchimento src gnome org>]

commit 83bff853879fe2a84981a0bee564ba27086d1e24
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri May 1 15:47:59 2020 -0700

    CI: Update some Valgrind suppression expressions
    
    To account for changes in mozjs68, and different call stacks of the same
    leak in different versions of software.
    
    Some suppressions are no longer necessary.
    
    We also have to tell valgrind not to trace /usr/bin/stat since we use it
    in a script test.

 installed-tests/extra/gjs.supp | 99 ++++++++++--------------------------------
 meson.build                    |  2 +-
 2 files changed, 24 insertions(+), 77 deletions(-)
---
diff --git a/installed-tests/extra/gjs.supp b/installed-tests/extra/gjs.supp
index f45aaeb1..42f4e488 100644
--- a/installed-tests/extra/gjs.supp
+++ b/installed-tests/extra/gjs.supp
@@ -13,87 +13,13 @@
    fun:allocate_stack
    fun:pthread_create@@GLIBC_2.2.5
    fun:_ZN7mozilla9TimeStamp20ComputeProcessUptimeEv
-   fun:_ZN7mozilla9TimeStamp15ProcessCreationERb
+   fun:_ZN7mozilla9TimeStamp15ProcessCreationEPb
    fun:_ZN2JS6detail25InitWithFailureDiagnosticEb
-   fun:JS_Init
-}
-
-{
-   mozjs-thread-stack-new-context
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:calloc
-   fun:allocate_dtv
-   fun:_dl_allocate_tls
-   fun:allocate_stack
-   fun:pthread_create@@GLIBC_2.2.5
-   fun:_ZN2js6Thread6createEPFPvS1_ES1_
-   fun:init<void (&)(void*), js::HelperThread*>
-   fun:_ZN2js23GlobalHelperThreadState17ensureInitializedEv
-   fun:_ZN9JSRuntime4initEjj
-   fun:init
-   fun:NewContext
-   fun:_Z13JS_NewContextjjP9JSContext
-}
-
-{
-   mozjs-gc-helper-thread-mutex-guard
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:js_malloc
-   fun:js_new<mozilla::Vector<const js::Mutex*> >
-   fun:_ZN2js5Mutex14heldMutexStackEv.part.*
-   fun:heldMutexStack
-   fun:_ZN2js5Mutex4lockEv
-   fun:LockGuard
-   fun:_ZN2js25AutoLockHelperThreadStateC1EON7mozilla6detail19GuardObjectNotifierE
-   fun:_ZN2js12HelperThread10threadLoopEv
-   fun:callMain<0*>
-   fun:_ZN2js6detail16ThreadTrampolineIRFvPvEJPNS_12HelperThreadEEE5StartES2_
-   fun:start_thread
-   fun:clone
-}
-
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1478679
-{
-   mozjs-bmo-1478679-1
-   Memcheck:Leak
-   match-leak-kinds: all
-   ...
-   fun:createTable
-   fun:init
-   fun:init
-   fun:_ZN2js8coverage10LCovSource11writeScriptEP8JSScript
-}
-
-{
-   mozjs-bmo-1478679-2
-   Memcheck:Leak
-   match-leak-kinds: all
-   ...
-   fun:_Z9js_strdupPKc
-   fun:_ZN2js8coverage15LCovCompartment11lookupOrAddEP13JSCompartmentPKc
+   fun:_Z7JS_Initv
 }
 
 # Various things that I don't believe are related to GJS
 
-{
-   gl-dispatch-init
-   Memcheck:Leak
-   match-leak-kinds: possible
-   ...
-   fun:__glDispatchInit
-}
-
-{
-   gl-dispatch-register-stub-callbacks
-   Memcheck:Leak
-   match-leak-kinds: possible
-   ...
-   fun:__glDispatchRegisterStubCallbacks
-}
-
 {
    gtk-style-context
    Memcheck:Leak
@@ -151,10 +77,12 @@
    fun:_cairo_toy_font_face_create_impl_face
    fun:_cairo_toy_font_face_init
    fun:cairo_toy_font_face_create
+   ...
    fun:_cairo_gstate_ensure_font_face
    fun:_cairo_gstate_ensure_scaled_font
    fun:_cairo_gstate_get_scaled_font
    fun:_cairo_default_context_get_scaled_font
+   ...
    fun:cairo_show_text
 }
 
@@ -181,6 +109,25 @@
    fun:main
 }
 
+# https://gitlab.gnome.org/GNOME/glib/-/issues/1911
+{
+   g-type-register-static
+   Memcheck:Leak
+   match-leak-kinds:possible
+   fun:malloc
+   ...
+   fun:g_type_register_static
+}
+
+{
+   g-type-register-static-calloc
+   Memcheck:Leak
+   match-leak-kinds:possible
+   fun:calloc
+   ...
+   fun:g_type_register_static
+}
+
 # SpiderMonkey data races
 
 # These are in SpiderMonkey's atomics / thread barrier stuff so presumably
diff --git a/meson.build b/meson.build
index 22b2ee95..687a3541 100644
--- a/meson.build
+++ b/meson.build
@@ -628,7 +628,7 @@ valgrind_args = [
     '--leak-check=full',
     '--num-callers=15',
     '--trace-children=yes',
-    '--trace-children-skip=*basename,*cat,*diff,*echo,*grep,*rm,*sed,*true',
+    '--trace-children-skip=*basename,*cat,*diff,*echo,*grep,*rm,*sed,*stat,*true',
     '--error-exitcode=1'
 ]