Merge pull request #2315 from sparklemotion/flavorjones-fix-default-v…

…algrind-suppression ci: fix default valgrind suppression
sparklemotion · Aug 18, 2021 · a28eee1 · a28eee1
2 parents e9190ac + 5e7ed9a
commit a28eee1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/rakelib/test.rake b/rakelib/test.rake
@@ -53,6 +53,7 @@ class ValgrindTestTask < Rake::TestTask
     matches << formatted_ruby_version.split(".")[0,3].join(".") # e.g. "ruby-2.5.1"
     matches << formatted_ruby_version.split(".")[0,2].join(".") # e.g. "ruby-2.5"
     matches << formatted_ruby_version.split(".")[0,1].join(".") # e.g. "ruby-2"
+    matches << formatted_ruby_version.split("-").first          # e.g. "ruby"
     matches
   end
 end

diff --git a/suppressions/nokogiri_ruby-2.7.supp b/suppressions/nokogiri_ruby-2.7.supp
@@ -2,7 +2,7 @@
    ruby 2.7 startup
    Memcheck:Addr4
    fun:iseq_peephole_optimize
-   fun:iseq_optimize
+   fun:iseq_optimize*
    fun:iseq_setup_insn
    fun:iseq_setup_insn
    fun:rb_iseq_compile_node

diff --git a/suppressions/nokogiri_ruby.supp b/suppressions/nokogiri_ruby.supp
@@ -0,0 +1,10 @@
+{
+   this should be caught by default suppressions see #2314
+   Memcheck:Addr8
+   fun:strncmp
+   fun:is_dst
+   fun:_dl_dst_*
+   ...
+   fun:_dl_map_object
+   ...
+}