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 a8bd90ef8b7888d41565b0cd8128736a31e4eaed..503e7f2ee23cc1047ccdd735ebf056dfcba3f887 100644 (file)
--- 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 b3e8121708364767a4ae708d3d5d005de6b1ead0..58b282e93f1b158b3861552ab646510cff443c9f 100644 (file)
--- 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 2c63cddbcbeba40563b98c710d7cbefa7790e7e6..4070bc15a9dfc137071d52f1ceceb009154c1583 100755 (executable)
--- 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 31418f48d68c0c73b43aed2c10fe23e7dd11fa27..93e9f0a7d2901e6b22ec6dcb77c4f36f061b8da9 100755 (executable)
--- 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 96d12e4c4669287edef88506493e1a17260eda89..4ba567521f55bfb81cf60584d2baa2fdc70a860f 100644 (file)
--- 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 7de2c93fb9a81326aa9a8c059065ec015a07464f..b7501b6a01486fb55fd12f23e0d40ea567716944 100644 (file)
--- 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 3669495bbfbe6ec37ec6b1ae24ded2d0a3b082e0..92756c6138d8cc5c3d2d3b5b564eb3543c694a08 100644 (file)
--- 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 f3f660ecef4dcfd7db00f5eeb85d637b83cc93b7..821937eeccf28887907a43c211edd0b6409330fe 100644 (file)
--- 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