From 04d30049bf9b4ae14262a50e8a16442e1edf75f8 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 23 Apr 2024 14:14:33 +0200 Subject: [PATCH] Filter away "main" differences in filter_fdleak Stack traces showing where fds were created show some differences in the "main" function, different line numbers, or (in binary) or (below main). Since the precise location of the original call in the main function isn't the goal of these tests just filer them all out and replace them with a simple "main". --- none/tests/fdleak_ipv4.stderr.exp | 6 +++--- none/tests/file_dclose.stderr.exp | 6 +++--- none/tests/filter_fdleak | 3 +++ none/tests/socket_close.stderr.exp | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/none/tests/fdleak_ipv4.stderr.exp b/none/tests/fdleak_ipv4.stderr.exp index c7493fab9..9612ef72a 100644 --- a/none/tests/fdleak_ipv4.stderr.exp +++ b/none/tests/fdleak_ipv4.stderr.exp @@ -2,15 +2,15 @@ File descriptor 4: AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:... is already closed at 0x........: close (in /...libc...) by 0x........: client (fdleak_ipv4.c:70) - by 0x........: main (fdleak_ipv4.c:90) + by 0x........: main Previously closed at 0x........: close (in /...libc...) by 0x........: client (fdleak_ipv4.c:69) - by 0x........: main (fdleak_ipv4.c:90) + by 0x........: main Originally opened at 0x........: dup (in /...libc...) by 0x........: client (fdleak_ipv4.c:68) - by 0x........: main (fdleak_ipv4.c:90) + by 0x........: main FILE DESCRIPTORS: 5 open (3 std) at exit. Open AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:... diff --git a/none/tests/file_dclose.stderr.exp b/none/tests/file_dclose.stderr.exp index fa14b56b3..26721e6f5 100644 --- a/none/tests/file_dclose.stderr.exp +++ b/none/tests/file_dclose.stderr.exp @@ -3,11 +3,11 @@ time passes and we close 3 again File descriptor 3: file_dclose.tmp is already closed at 0x........: close (in /...libc...) by 0x........: closefile (file_dclose.c:17) - by 0x........: main (file_dclose.c:35) + by 0x........: main Previously closed at 0x........: close (in /...libc...) - by 0x........: main (file_dclose.c:31) + by 0x........: main Originally opened at 0x........: creat (in /...libc...) by 0x........: openfile (file_dclose.c:11) - by 0x........: main (file_dclose.c:28) + by 0x........: main diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak index d1fbfe043..a558021dc 100755 --- a/none/tests/filter_fdleak +++ b/none/tests/filter_fdleak @@ -37,6 +37,9 @@ awk '/ at .* _syscall6 /{getline; getline; sub(/ by /, " at "); print; next}{pri # painfully minor variations between them. perl -p -0 -e 's/(Open[^\n]*\n)( (at|by)[^\n]*\n)+/$1 ...\n/gs' | +sed "s/by 0x........: (below main)/by 0x........: main/" | +sed "s/by 0x........: main (.*)/by 0x........: main/" | + # With glibc debuginfo installed we might see syscall-template.S, close.c or creat64.c perl -p -e "s/\(syscall-template.S:[0-9]*\)/(in \/...libc...)/" | perl -p -e "s/\(close.c:[0-9]*\)/(in \/...libc...)/" | diff --git a/none/tests/socket_close.stderr.exp b/none/tests/socket_close.stderr.exp index 884662046..5352390dd 100644 --- a/none/tests/socket_close.stderr.exp +++ b/none/tests/socket_close.stderr.exp @@ -3,11 +3,11 @@ close socket_fd 3 and close the socket again 3 File descriptor 3: AF_UNIX socket 3: /tmp/vgtest-foofrob is already closed at 0x........: close (in /...libc...) - by 0x........: main (socket_close.c:40) + by 0x........: main Previously closed at 0x........: close (in /...libc...) - by 0x........: main (socket_close.c:36) + by 0x........: main Originally opened at 0x........: socket (in /...libc...) by 0x........: open_socket (socket_close.c:17) - by 0x........: main (socket_close.c:31) + by 0x........: main -- 2.39.5