From: Mark Wielaard <mark@klomp.org>
Date: Fri, 15 Mar 2024 12:03:58 +0000 (+0100)
Subject: Adjust filter_fdleak for glibc debuginfo
X-Git-Tag: VALGRIND_3_23_0~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccdde6d76fc442360153a8950176700982509fbd;p=thirdparty%2Fvalgrind.git

Adjust filter_fdleak for glibc debuginfo

With glibc debuginfo installed we might see syscal-template.S or
close.c replace that with "in ...libc...".
---

diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak
index 7258bc799..f7637abd0 100755
--- a/none/tests/filter_fdleak
+++ b/none/tests/filter_fdleak
@@ -25,6 +25,8 @@ perl -p -e 's/ _close / close /;s/ _openat / creat /;s/internet/AF_INET socket 4
 # So we just cut out the entire stack trace.  It's coarse but effective;
 # before we did this we had a plethora of expected outputs, with only
 # painfully minor variations between them.
-perl -p -0 -e 's/(Open[^\n]*\n)(   (at|by)[^\n]*\n)+/$1   ...\n/gs'
-
+perl -p -0 -e 's/(Open[^\n]*\n)(   (at|by)[^\n]*\n)+/$1   ...\n/gs' |
 
+# With glibc debuginfo installed we might see syscal-template.S or close.c
+perl -p -e "s/\(syscall-template.S:[0-9]*\)/(in \/...libc...)/" |
+perl -p -e "s/\(close.c:[0-9]*\)/(in \/...libc...)/"