From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Thu, 30 Oct 2025 14:17:50 +0000 (+0100)
Subject: Darwin regtest: changes to filters and sed commands
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a490eeb27c0fa3109ed81f24d8333aeacc37b4b;p=thirdparty%2Fvalgrind.git

Darwin regtest: changes to filters and sed commands

Darwin libc is quite incontinent, so use filter_xml_leak
in a few places rather than filter_xml.

Also old Darwin 17.7 sed doesn't understand "+1d" to delete the
matched line and the next line. So use N to join, s to delete the
newline and another match with d to delete the joined linbes.
---

diff --git a/darwin17.supp b/darwin17.supp
index a8bd90ef8..503e7f2ee 100644
--- a/darwin17.supp
+++ b/darwin17.supp
@@ -136,7 +136,7 @@
 {
    OSX1013:15-Leak
    Memcheck:Leak
-   match-leak-kinds: reachable
+   match-leak-kinds: definite,reachable
    fun:malloc
    fun:__smakebuf
    ...
diff --git a/memcheck/tests/client-msg-as-xml.vgtest b/memcheck/tests/client-msg-as-xml.vgtest
index b3e812170..58b282e93 100644
--- a/memcheck/tests/client-msg-as-xml.vgtest
+++ b/memcheck/tests/client-msg-as-xml.vgtest
@@ -1,3 +1,3 @@
 prog: client-msg
 vgopts: --xml=yes --xml-fd=2 --log-file=/dev/null
-stderr_filter: filter_xml
+stderr_filter: filter_xml_leak
diff --git a/memcheck/tests/filter_xml b/memcheck/tests/filter_xml
index 2c63cddbc..4070bc15a 100755
--- a/memcheck/tests/filter_xml
+++ b/memcheck/tests/filter_xml
@@ -35,8 +35,6 @@ perl -0 -p -e "s/<suppressed_contexts>.*<\/suppressed_contexts>/<suppressed_from
 # Chops everything within <stack>...</stack>.
 perl -p -0 -e 's/(<what>Syscall param[^\n]*\n)([^\n]*(stack|frame|ip|obj|fn|dir|file|line)[^\n]*\n)+/$1/gs' |
 
-sed "/<all_heap_blocks_freed>/,+1d"
-
 # Collected wisdom re Perl magic incantation:
 #
 # From: Tom Hughes
@@ -51,3 +49,6 @@ sed "/<all_heap_blocks_freed>/,+1d"
 # can do with the -0 switch.                                              
 #
 # Hence -0 -p.
+
+sed "/<all_heap_blocks_freed>/{N;s/\n//;};/<all_heap_blocks_freed>/d"
+
diff --git a/memcheck/tests/filter_xml_leak b/memcheck/tests/filter_xml_leak
index 31418f48d..93e9f0a7d 100755
--- a/memcheck/tests/filter_xml_leak
+++ b/memcheck/tests/filter_xml_leak
@@ -2,4 +2,4 @@
 
 ./filter_xml "$@" |
 
-sed -e '/<leak_summary>...<\/leak_summary>/,+1d'
+sed '/<leak_summary>...<\/leak_summary>/{N;s/\n//;};/<leak_summary>...<\/leak_summary>/d'
diff --git a/memcheck/tests/mismatches_xml.vgtest b/memcheck/tests/mismatches_xml.vgtest
index 96d12e4c4..4ba567521 100644
--- a/memcheck/tests/mismatches_xml.vgtest
+++ b/memcheck/tests/mismatches_xml.vgtest
@@ -1,3 +1,3 @@
 prog: mismatches
 vgopts: --xml=yes --xml-fd=2 --log-file=/dev/null
-stderr_filter: filter_xml
+stderr_filter: filter_xml_leak
diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1_xml.vgtest b/memcheck/tests/sized_aligned_new_delete_misaligned1_xml.vgtest
index 7de2c93fb..b7501b6a0 100644
--- a/memcheck/tests/sized_aligned_new_delete_misaligned1_xml.vgtest
+++ b/memcheck/tests/sized_aligned_new_delete_misaligned1_xml.vgtest
@@ -1,4 +1,4 @@
 prog: sized_aligned_new_delete_misaligned1
 prereq: test -e ./sized_aligned_new_delete_misaligned1
 vgopts: --xml=yes --xml-fd=2 --log-file=/dev/null
-stderr_filter: filter_xml
+stderr_filter: filter_xml_leak
diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned2_xml.vgtest b/memcheck/tests/sized_aligned_new_delete_misaligned2_xml.vgtest
index 3669495bb..92756c613 100644
--- a/memcheck/tests/sized_aligned_new_delete_misaligned2_xml.vgtest
+++ b/memcheck/tests/sized_aligned_new_delete_misaligned2_xml.vgtest
@@ -1,4 +1,4 @@
 prog: sized_aligned_new_delete_misaligned2
 prereq: test -e ./sized_aligned_new_delete_misaligned2
 vgopts: --xml=yes --xml-fd=2 --log-file=/dev/null
-stderr_filter: filter_xml
+stderr_filter: filter_xml_leak
diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned3_xml.vgtest b/memcheck/tests/sized_aligned_new_delete_misaligned3_xml.vgtest
index f3f660ece..821937eec 100644
--- a/memcheck/tests/sized_aligned_new_delete_misaligned3_xml.vgtest
+++ b/memcheck/tests/sized_aligned_new_delete_misaligned3_xml.vgtest
@@ -1,4 +1,4 @@
 prog: sized_aligned_new_delete_misaligned3
 prereq: test -e ./sized_aligned_new_delete_misaligned3
 vgopts: --xml=yes --xml-fd=2 --log-file=/dev/null
-stderr_filter: filter_xml
+stderr_filter: filter_xml_leak