Improve the fdleak filter and adjust the track_new expected output.

diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak
index 0e91013d7f0a06326a1a438a83b19db1230b77fa..3e019d82d58603e9e287c2bab6e3b99f03b8e709 100755 (executable)
--- a/none/tests/filter_fdleak
+++ b/none/tests/filter_fdleak
@@ -34,6 +34,14 @@ perl -p -e "s/: open \(/: creat (/" |
 # arm64 write resolved to file:line with debuginfo
 perl -p -e "s/write\.c:[1-9][0-9]*/in \/...libc.../" |
 
+# Remove "internal" _functions
+sed '/by 0x........: _/d' |
+
+sed -E 's/ ([a-zA-Z0-9_]+)@@?[A-Z0-9._]+/ \1/' |
+perl -p -e "s/\(dprintf.c:[0-9]*\)/(in \/...libc...)/" |
+perl -p -e "s/\(open.c:[0-9]*\)/(in \/...libc...)/" |
+perl -p -e "s/\(lseek(?:64)?.c:[0-9]*\)/(in \/...libc...)/" |
+
 # FreeBSD specific fdleak filters
 perl -p -e 's/ _close / close /;s/ _openat / creat /;s/ _write/ write/;s/internet/AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:.../' |
 sed '/by 0x........: close (in \/...libc...)/d' |

diff --git a/none/tests/track_new.stderr.exp b/none/tests/track_new.stderr.exp
index 99138b64fd5990c573ab73f742e34444f49779eb..0e1e6adcd9043fd9f64a550e212d2567ce23dc77 100644 (file)
--- a/none/tests/track_new.stderr.exp
+++ b/none/tests/track_new.stderr.exp
@@ -1,12 +1,10 @@
-File descriptor 1020 was closed already
+File descriptor was closed already
    at 0x........: write (in /...libc...)
-   by 0x........: __printf_buffer_flush_dprintf (in /...libc...)
-   by 0x........: __vdprintf_internal (in /...libc...)
-   by 0x........: dprintf (in /...libc...)
-   by 0x........: main (track_new.c:15)
+   by 0x........: dprintf
+   by 0x........: main
  Previously closed
    at 0x........: close (in /...libc...)
-   by 0x........: main (track_new.c:10)
+   by 0x........: main
  Originally opened
-   at 0x........: open (in /...libc...)
-   by 0x........: main (track_new.c:8)
+   at 0x........: creat (in /...libc...)
+   by 0x........: main

diff --git a/none/tests/track_new.vgtest b/none/tests/track_new.vgtest
index 28488125588a5315113e17aee4da4d99daba070f..f6f72d880daf2957d42fc66d321b8918420bb1db 100644 (file)
--- a/none/tests/track_new.vgtest
+++ b/none/tests/track_new.vgtest
@@ -1,3 +1,4 @@
 prog: track_new
 prereq: test -x track_new
 vgopts: -q --track-fds=yes --modify-fds=high
+stderr_filter: filter_fdleak