From: Nicholas Nethercote Date: Tue, 17 Feb 2009 06:55:10 +0000 (+0000) Subject: For the fdleak_* tests, completely remove the stack traces showing where X-Git-Tag: svn/VALGRIND_3_5_0~964 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2857bd483ea61928d99f632eba526f247786433;p=thirdparty%2Fvalgrind.git For the fdleak_* tests, completely remove the stack traces showing where file descriptors came into existence, because there's too much variation and all the expected outputs are a pain. This allows 16 fdleak_*.exp[234] files to be removed. Also remove an unnecessary newline in a tmp filename in fdleak_creat.c. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9194 --- diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index 600cc86e07..41d21d901e 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -56,26 +56,16 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ execve.vgtest execve.stdout.exp execve.stderr.exp \ faultstatus.vgtest faultstatus.stderr.exp \ fcntl_setown.vgtest fcntl_setown.stdout.exp fcntl_setown.stderr.exp \ - fdleak_cmsg.stderr.exp fdleak_cmsg.stderr.exp2 \ - fdleak_cmsg.stderr.exp3 fdleak_cmsg.stderr.exp4 \ - fdleak_cmsg.vgtest \ - fdleak_creat.stderr.exp fdleak_creat.stderr.exp2 \ - fdleak_creat.stderr.exp3 fdleak_creat.vgtest \ - fdleak_dup.stderr.exp fdleak_dup.stderr.exp2 \ - fdleak_dup.stderr.exp3 fdleak_dup.vgtest \ - fdleak_dup2.stderr.exp fdleak_dup2.stderr.exp2 \ - fdleak_dup2.stderr.exp3 fdleak_dup2.vgtest \ - fdleak_fcntl.stderr.exp fdleak_fcntl.stderr.exp2 \ - fdleak_fcntl.stderr.exp3 fdleak_fcntl.stderr.exp4 \ - fdleak_fcntl.vgtest \ - fdleak_ipv4.stderr.exp fdleak_ipv4.stderr.exp2 \ - fdleak_ipv4.stdout.exp fdleak_ipv4.vgtest \ - fdleak_open.stderr.exp fdleak_open.stderr.exp2 fdleak_open.vgtest \ - fdleak_pipe.stderr.exp fdleak_pipe.stderr.exp2 fdleak_pipe.vgtest \ - fdleak_socketpair.stderr.exp fdleak_socketpair.stderr.exp2 \ - fdleak_socketpair.vgtest \ - floored.stderr.exp floored.stdout.exp \ - floored.vgtest \ + fdleak_cmsg.stderr.exp fdleak_cmsg.vgtest \ + fdleak_creat.stderr.exp fdleak_creat.vgtest \ + fdleak_dup.stderr.exp fdleak_dup.vgtest \ + fdleak_dup2.stderr.exp fdleak_dup2.vgtest \ + fdleak_fcntl.stderr.exp fdleak_fcntl.vgtest \ + fdleak_ipv4.stderr.exp fdleak_ipv4.stdout.exp fdleak_ipv4.vgtest \ + fdleak_open.stderr.exp fdleak_open.vgtest \ + fdleak_pipe.stderr.exp fdleak_pipe.vgtest \ + fdleak_socketpair.stderr.exp fdleak_socketpair.vgtest \ + floored.stderr.exp floored.stdout.exp floored.vgtest \ fork.stderr.exp fork.stdout.exp fork.vgtest \ fucomip.stderr.exp fucomip.vgtest \ gxx304.stderr.exp gxx304.vgtest \ diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp index 5e98467c36..d9328b97ff 100644 --- a/none/tests/fdleak_cmsg.stderr.exp +++ b/none/tests/fdleak_cmsg.stderr.exp @@ -2,22 +2,16 @@ FILE DESCRIPTORS: 7 open at exit. Open AF_UNIX socket .: /tmp/sock - at 0x........: accept (in /...libc...) - by 0x........: server (fdleak_cmsg.c:64) - by 0x........: main (fdleak_cmsg.c:174) + ... Open AF_UNIX socket .: /tmp/sock - at 0x........: socket (in /...libc...) - by 0x........: server (fdleak_cmsg.c:33) - by 0x........: main (fdleak_cmsg.c:174) + ... Open file descriptor .: /tmp/data2 - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_cmsg.c:174) + ... Open file descriptor .: /tmp/data1 - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_cmsg.c:174) + ... Open file descriptor .: . @@ -32,19 +26,13 @@ Open file descriptor .: /dev/null FILE DESCRIPTORS: 6 open at exit. Open file descriptor .: /tmp/data2 - at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:131) - by 0x........: main (fdleak_cmsg.c:178) + ... Open file descriptor .: /tmp/data1 - at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:131) - by 0x........: main (fdleak_cmsg.c:178) + ... Open AF_UNIX socket .: - at 0x........: socket (in /...libc...) - by 0x........: client (fdleak_cmsg.c:110) - by 0x........: main (fdleak_cmsg.c:178) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_cmsg.stderr.exp2 b/none/tests/fdleak_cmsg.stderr.exp2 deleted file mode 100644 index 62a3ab10dc..0000000000 --- a/none/tests/fdleak_cmsg.stderr.exp2 +++ /dev/null @@ -1,60 +0,0 @@ - - -FILE DESCRIPTORS: 7 open at exit. -Open AF_UNIX socket .: /tmp/sock - at 0x........: accept (in /...libc...) - by 0x........: server (fdleak_cmsg.c:64) - by 0x........: main (fdleak_cmsg.c:174) - -Open AF_UNIX socket .: /tmp/sock - at 0x........: socket (in /...libc...) - by 0x........: server (fdleak_cmsg.c:33) - by 0x........: main (fdleak_cmsg.c:174) - -Open file descriptor .: /tmp/data2 - at 0x........: open (in /...libc...) - by 0x........: server (fdleak_cmsg.c:27) - by 0x........: main (fdleak_cmsg.c:174) - -Open file descriptor .: /tmp/data1 - at 0x........: open (in /...libc...) - by 0x........: server (fdleak_cmsg.c:21) - by 0x........: main (fdleak_cmsg.c:174) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - - -FILE DESCRIPTORS: 6 open at exit. -Open file descriptor .: /tmp/data2 - at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:131) - by 0x........: main (fdleak_cmsg.c:178) - -Open file descriptor .: /tmp/data1 - at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:131) - by 0x........: main (fdleak_cmsg.c:178) - -Open AF_UNIX socket .: - at 0x........: socket (in /...libc...) - by 0x........: client (fdleak_cmsg.c:110) - by 0x........: main (fdleak_cmsg.c:178) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_cmsg.stderr.exp3 b/none/tests/fdleak_cmsg.stderr.exp3 deleted file mode 100644 index ba70333ebd..0000000000 --- a/none/tests/fdleak_cmsg.stderr.exp3 +++ /dev/null @@ -1,53 +0,0 @@ - - -FILE DESCRIPTORS: 7 open at exit. -Open AF_UNIX socket .: /tmp/sock - at 0x........: accept (in /...libc...) - by 0x........: main (fdleak_cmsg.c:195) - -Open AF_UNIX socket .: /tmp/sock - at 0x........: socket (in /...libc...) - by 0x........: main (fdleak_cmsg.c:195) - -Open file descriptor .: /tmp/data2 - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_cmsg.c:195) - -Open file descriptor .: /tmp/data1 - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_cmsg.c:195) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - - -FILE DESCRIPTORS: 6 open at exit. -Open file descriptor .: /tmp/data2 - at 0x........: recvmsg (in /...libc...) - by 0x........: main (fdleak_cmsg.c:199) - -Open file descriptor .: /tmp/data1 - at 0x........: recvmsg (in /...libc...) - by 0x........: main (fdleak_cmsg.c:199) - -Open AF_UNIX socket .: - at 0x........: socket (in /...libc...) - by 0x........: main (fdleak_cmsg.c:199) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_cmsg.stderr.exp4 b/none/tests/fdleak_cmsg.stderr.exp4 deleted file mode 100644 index 176a555ccd..0000000000 --- a/none/tests/fdleak_cmsg.stderr.exp4 +++ /dev/null @@ -1,60 +0,0 @@ - - -FILE DESCRIPTORS: 7 open at exit. -Open AF_UNIX socket .: /tmp/sock - at 0x........: accept (in /...libc...) - by 0x........: server (fdleak_cmsg.c:85) - by 0x........: main (fdleak_cmsg.c:195) - -Open AF_UNIX socket .: /tmp/sock - at 0x........: socket (in /...libc...) - by 0x........: server (fdleak_cmsg.c:54) - by 0x........: main (fdleak_cmsg.c:195) - -Open file descriptor .: /tmp/data2 - at 0x........: open (in /...libc...) - by 0x........: server (fdleak_cmsg.c:48) - by 0x........: main (fdleak_cmsg.c:195) - -Open file descriptor .: /tmp/data1 - at 0x........: open (in /...libc...) - by 0x........: server (fdleak_cmsg.c:42) - by 0x........: main (fdleak_cmsg.c:195) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - - -FILE DESCRIPTORS: 6 open at exit. -Open file descriptor .: /tmp/data2 - at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:152) - by 0x........: main (fdleak_cmsg.c:199) - -Open file descriptor .: /tmp/data1 - at 0x........: recvmsg (in /...libc...) - by 0x........: client (fdleak_cmsg.c:152) - by 0x........: main (fdleak_cmsg.c:199) - -Open AF_UNIX socket .: - at 0x........: socket (in /...libc...) - by 0x........: client (fdleak_cmsg.c:131) - by 0x........: main (fdleak_cmsg.c:199) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_creat.c b/none/tests/fdleak_creat.c index 9d12216205..7f3fd72e90 100644 --- a/none/tests/fdleak_creat.c +++ b/none/tests/fdleak_creat.c @@ -14,7 +14,7 @@ main (int argc, char **argv) CLOSE_INHERITED_FDS; - sprintf(filename, "/tmp/file.%d\n", getpid()); + sprintf(filename, "/tmp/file.%d", getpid()); creat(filename, 0); unlink(filename); return 0; diff --git a/none/tests/fdleak_creat.stderr.exp b/none/tests/fdleak_creat.stderr.exp index 978ad39171..c3dcd75be4 100644 --- a/none/tests/fdleak_creat.stderr.exp +++ b/none/tests/fdleak_creat.stderr.exp @@ -2,9 +2,7 @@ FILE DESCRIPTORS: 4 open at exit. Open file descriptor .: /tmp/file - - at 0x........: creat (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_creat.stderr.exp2 b/none/tests/fdleak_creat.stderr.exp2 deleted file mode 100644 index e9ea3611c0..0000000000 --- a/none/tests/fdleak_creat.stderr.exp2 +++ /dev/null @@ -1,18 +0,0 @@ - - -FILE DESCRIPTORS: 4 open at exit. -Open file descriptor .: /tmp/file - - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_creat.c:18) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_creat.stderr.exp3 b/none/tests/fdleak_creat.stderr.exp3 deleted file mode 100644 index 169fa09657..0000000000 --- a/none/tests/fdleak_creat.stderr.exp3 +++ /dev/null @@ -1,18 +0,0 @@ - - -FILE DESCRIPTORS: 4 open at exit. -Open file descriptor .: /tmp/file - - at 0x........: creat (in /...libc...) - by 0x........: main (fdleak_creat.c:18) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_dup.stderr.exp b/none/tests/fdleak_dup.stderr.exp index 07326124af..50c5cd4e08 100644 --- a/none/tests/fdleak_dup.stderr.exp +++ b/none/tests/fdleak_dup.stderr.exp @@ -2,12 +2,10 @@ FILE DESCRIPTORS: 5 open at exit. Open file descriptor .: /dev/null - at 0x........: dup (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_dup.stderr.exp2 b/none/tests/fdleak_dup.stderr.exp2 deleted file mode 100644 index 62ba9fe46c..0000000000 --- a/none/tests/fdleak_dup.stderr.exp2 +++ /dev/null @@ -1,21 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open file descriptor .: /dev/null - at 0x........: dup (in /...libc...) - by 0x........: (below main) - -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_dup.c:16) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_dup.stderr.exp3 b/none/tests/fdleak_dup.stderr.exp3 deleted file mode 100644 index de4666f055..0000000000 --- a/none/tests/fdleak_dup.stderr.exp3 +++ /dev/null @@ -1,21 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open file descriptor .: /dev/null - at 0x........: dup (in /...libc...) - by 0x........: main (fdleak_dup.c:17) - -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_dup.c:16) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_dup2.stderr.exp b/none/tests/fdleak_dup2.stderr.exp index aea77d98e3..ab5bbba401 100644 --- a/none/tests/fdleak_dup2.stderr.exp +++ b/none/tests/fdleak_dup2.stderr.exp @@ -2,16 +2,13 @@ FILE DESCRIPTORS: 6 open at exit. Open file descriptor .: /dev/null - at 0x........: dup2 (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: /dev/null - at 0x........: dup2 (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_dup2.stderr.exp2 b/none/tests/fdleak_dup2.stderr.exp2 deleted file mode 100644 index b3688da94b..0000000000 --- a/none/tests/fdleak_dup2.stderr.exp2 +++ /dev/null @@ -1,25 +0,0 @@ - - -FILE DESCRIPTORS: 6 open at exit. -Open file descriptor .: /dev/null - at 0x........: dup2 (in /...libc...) - by 0x........: (below main) - -Open file descriptor .: /dev/null - at 0x........: dup2 (in /...libc...) - by 0x........: (below main) - -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_dup2.c:17) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_dup2.stderr.exp3 b/none/tests/fdleak_dup2.stderr.exp3 deleted file mode 100644 index 4b736c5d87..0000000000 --- a/none/tests/fdleak_dup2.stderr.exp3 +++ /dev/null @@ -1,25 +0,0 @@ - - -FILE DESCRIPTORS: 6 open at exit. -Open file descriptor .: /dev/null - at 0x........: dup2 (in /...libc...) - by 0x........: main (fdleak_dup2.c:20) - -Open file descriptor .: /dev/null - at 0x........: dup2 (in /...libc...) - by 0x........: main (fdleak_dup2.c:21) - -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_dup2.c:17) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_fcntl.stderr.exp b/none/tests/fdleak_fcntl.stderr.exp index 1626954e70..50c5cd4e08 100644 --- a/none/tests/fdleak_fcntl.stderr.exp +++ b/none/tests/fdleak_fcntl.stderr.exp @@ -2,12 +2,10 @@ FILE DESCRIPTORS: 5 open at exit. Open file descriptor .: /dev/null - at 0x........: fcntl (in /...libc...) - by 0x........: main (fdleak_fcntl.c:18) + ... Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_fcntl.stderr.exp2 b/none/tests/fdleak_fcntl.stderr.exp2 deleted file mode 100644 index 9d57cbe006..0000000000 --- a/none/tests/fdleak_fcntl.stderr.exp2 +++ /dev/null @@ -1,22 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open file descriptor .: /dev/null - at 0x........: fcntl (in /...libc...) - by 0x........: fcntl (in /...libc...) - by 0x........: main (fdleak_fcntl.c:18) - -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: (below main) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_fcntl.stderr.exp3 b/none/tests/fdleak_fcntl.stderr.exp3 deleted file mode 100644 index 0b907a81c9..0000000000 --- a/none/tests/fdleak_fcntl.stderr.exp3 +++ /dev/null @@ -1,22 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open file descriptor .: /dev/null - at 0x........: do_fcntl (in /...libc...) - by 0x........: fcntl (in /...libc...) - by 0x........: main (fdleak_fcntl.c:18) - -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: (below main) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_fcntl.stderr.exp4 b/none/tests/fdleak_fcntl.stderr.exp4 deleted file mode 100644 index 872fd5c907..0000000000 --- a/none/tests/fdleak_fcntl.stderr.exp4 +++ /dev/null @@ -1,21 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open file descriptor .: /dev/null - at 0x........: fcntl (in /...libc...) - by 0x........: main (fdleak_fcntl.c:18) - -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_fcntl.c:17) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_ipv4.stderr.exp b/none/tests/fdleak_ipv4.stderr.exp index 4317fe83f8..773080dcda 100644 --- a/none/tests/fdleak_ipv4.stderr.exp +++ b/none/tests/fdleak_ipv4.stderr.exp @@ -2,14 +2,10 @@ FILE DESCRIPTORS: 5 open at exit. Open AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:... - at 0x........: accept (in /...libc...) - by 0x........: server (fdleak_ipv4.c:44) - by 0x........: main (fdleak_ipv4.c:100) + ... Open AF_INET socket 3: 127.0.0.1:... <-> unbound - at 0x........: socket (in /...libc...) - by 0x........: server (fdleak_ipv4.c:21) - by 0x........: main (fdleak_ipv4.c:100) + ... Open file descriptor .: . @@ -24,9 +20,7 @@ Open file descriptor .: /dev/null FILE DESCRIPTORS: 4 open at exit. Open AF_INET socket 3: 127.0.0.1:... <-> 127.0.0.1:... - at 0x........: socket (in /...libc...) - by 0x........: client (fdleak_ipv4.c:60) - by 0x........: main (fdleak_ipv4.c:104) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_ipv4.stderr.exp2 b/none/tests/fdleak_ipv4.stderr.exp2 deleted file mode 100644 index ad2e664058..0000000000 --- a/none/tests/fdleak_ipv4.stderr.exp2 +++ /dev/null @@ -1,37 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open AF_INET socket 4: 127.0.0.1:... <-> 127.0.0.1:... - at 0x........: accept (in /...libc...) - by 0x........: main (fdleak_ipv4.c:100) - -Open AF_INET socket 3: 127.0.0.1:... <-> unbound - at 0x........: socket (in /...libc...) - by 0x........: main (fdleak_ipv4.c:100) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - - -FILE DESCRIPTORS: 4 open at exit. -Open AF_INET socket 3: 127.0.0.1:... <-> 127.0.0.1:... - at 0x........: socket (in /...libc...) - by 0x........: main (fdleak_ipv4.c:104) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_open.stderr.exp b/none/tests/fdleak_open.stderr.exp index 089931fdc8..ae14b421d5 100644 --- a/none/tests/fdleak_open.stderr.exp +++ b/none/tests/fdleak_open.stderr.exp @@ -2,8 +2,7 @@ FILE DESCRIPTORS: 4 open at exit. Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_open.stderr.exp2 b/none/tests/fdleak_open.stderr.exp2 deleted file mode 100644 index c16d17cdc6..0000000000 --- a/none/tests/fdleak_open.stderr.exp2 +++ /dev/null @@ -1,17 +0,0 @@ - - -FILE DESCRIPTORS: 4 open at exit. -Open file descriptor .: /dev/null - at 0x........: open (in /...libc...) - by 0x........: main (fdleak_open.c:13) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_pipe.stderr.exp b/none/tests/fdleak_pipe.stderr.exp index c67b386480..a265af5c9c 100644 --- a/none/tests/fdleak_pipe.stderr.exp +++ b/none/tests/fdleak_pipe.stderr.exp @@ -2,12 +2,10 @@ FILE DESCRIPTORS: 5 open at exit. Open file descriptor .: - at 0x........: pipe (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: - at 0x........: pipe (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_pipe.stderr.exp2 b/none/tests/fdleak_pipe.stderr.exp2 deleted file mode 100644 index 743f451e55..0000000000 --- a/none/tests/fdleak_pipe.stderr.exp2 +++ /dev/null @@ -1,21 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open file descriptor .: - at 0x........: pipe (in /...libc...) - by 0x........: main (fdleak_pipe.c:15) - -Open file descriptor .: - at 0x........: pipe (in /...libc...) - by 0x........: main (fdleak_pipe.c:15) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/fdleak_socketpair.stderr.exp b/none/tests/fdleak_socketpair.stderr.exp index f082675857..666c56f805 100644 --- a/none/tests/fdleak_socketpair.stderr.exp +++ b/none/tests/fdleak_socketpair.stderr.exp @@ -2,12 +2,10 @@ FILE DESCRIPTORS: 5 open at exit. Open AF_UNIX socket .: - at 0x........: socketpair (in /...libc...) - by 0x........: (below main) + ... Open AF_UNIX socket .: - at 0x........: socketpair (in /...libc...) - by 0x........: (below main) + ... Open file descriptor .: . diff --git a/none/tests/fdleak_socketpair.stderr.exp2 b/none/tests/fdleak_socketpair.stderr.exp2 deleted file mode 100644 index 2075bade17..0000000000 --- a/none/tests/fdleak_socketpair.stderr.exp2 +++ /dev/null @@ -1,21 +0,0 @@ - - -FILE DESCRIPTORS: 5 open at exit. -Open AF_UNIX socket .: - at 0x........: socketpair (in /...libc...) - by 0x........: main (fdleak_socketpair.c:15) - -Open AF_UNIX socket .: - at 0x........: socketpair (in /...libc...) - by 0x........: main (fdleak_socketpair.c:15) - -Open file descriptor .: . - - -Open file descriptor .: . - - -Open file descriptor .: /dev/null - - - diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak index d4ed2325cb..64f97266d8 100755 --- a/none/tests/filter_fdleak +++ b/none/tests/filter_fdleak @@ -9,4 +9,15 @@ sed s/"^Open \(AF_UNIX socket\|file descriptor\) [0-9]*: \/dev\/null/Open \\1 .: sed s/"^Open \(AF_UNIX socket\|file descriptor\) [0-9]*: \/tmp\/\(sock\|data1\|data2\|file\)\.[0-9]*/Open \\1 .: \/tmp\/\\2/" | sed s/"^Open file descriptor [0-9]*: .*/Open file descriptor .: ./" | sed s/"^Open file descriptor [0-9]*:$/Open file descriptor .:/" | -sed s/"127.0.0.1:[0-9]*/127.0.0.1:.../g" +sed s/"127.0.0.1:[0-9]*/127.0.0.1:.../g" | + +# Stack traces showing where fds were created have lots of variations: +# different numbers of entries, line numbers or not depending on whether +# libc debug info is present, 'main' vs. '(below main)', etc. +# +# 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 ...\n/gs' + +