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 600cc86e07c05d6ac23be7582568c23869c9185a..41d21d901e7eceed73a6d96e201e2586dec9fa73 100644 (file)
--- 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 5e98467c36d07b8d997135b4422b179fb0d36aeb..d9328b97ffd6f4ae68b6810d8378139e075b073b 100644 (file)
--- 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 .: .
    <inherited from parent>
@@ -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 .: <unknown>
-   at 0x........: socket (in /...libc...)
-   by 0x........: client (fdleak_cmsg.c:110)
-   by 0x........: main (fdleak_cmsg.c:178)
+   ...
 
 Open file descriptor .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_cmsg.stderr.exp2 b/none/tests/fdleak_cmsg.stderr.exp2
deleted file mode 100644 (file)
index 62a3ab1..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-
-
-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 .: <unknown>
-   at 0x........: socket (in /...libc...)
-   by 0x........: client (fdleak_cmsg.c:110)
-   by 0x........: main (fdleak_cmsg.c:178)
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_cmsg.stderr.exp3 b/none/tests/fdleak_cmsg.stderr.exp3
deleted file mode 100644 (file)
index ba70333..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-
-
-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 .: <unknown>
-   at 0x........: socket (in /...libc...)
-   by 0x........: main (fdleak_cmsg.c:199)
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_cmsg.stderr.exp4 b/none/tests/fdleak_cmsg.stderr.exp4
deleted file mode 100644 (file)
index 176a555..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-
-
-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 .: <unknown>
-   at 0x........: socket (in /...libc...)
-   by 0x........: client (fdleak_cmsg.c:131)
-   by 0x........: main (fdleak_cmsg.c:199)
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_creat.c b/none/tests/fdleak_creat.c
index 9d1221620586c0891ba1874b529c03dbdc0c9e24..7f3fd72e90735e4f654ed1788d6d92e63aff094b 100644 (file)
--- 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 978ad39171945f652620abd4a3a31c0929f5ffee..c3dcd75be43f7153e43a63960c197ab723085a65 100644 (file)
--- 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 .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_creat.stderr.exp2 b/none/tests/fdleak_creat.stderr.exp2
deleted file mode 100644 (file)
index e9ea361..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_creat.stderr.exp3 b/none/tests/fdleak_creat.stderr.exp3
deleted file mode 100644 (file)
index 169fa09..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_dup.stderr.exp b/none/tests/fdleak_dup.stderr.exp
index 07326124afab8c987ed7922ce7af6590b92f2789..50c5cd4e08b6ad2ddc1324458537f6dddbbaa5ce 100644 (file)
--- 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 .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_dup.stderr.exp2 b/none/tests/fdleak_dup.stderr.exp2
deleted file mode 100644 (file)
index 62ba9fe..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_dup.stderr.exp3 b/none/tests/fdleak_dup.stderr.exp3
deleted file mode 100644 (file)
index de4666f..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_dup2.stderr.exp b/none/tests/fdleak_dup2.stderr.exp
index aea77d98e3598c2d8b71ac5f5ad41189e4b0edef..ab5bbba4019c8b04220cc4731bfb04fc5e6baa36 100644 (file)
--- 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 .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_dup2.stderr.exp2 b/none/tests/fdleak_dup2.stderr.exp2
deleted file mode 100644 (file)
index b3688da..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_dup2.stderr.exp3 b/none/tests/fdleak_dup2.stderr.exp3
deleted file mode 100644 (file)
index 4b736c5..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_fcntl.stderr.exp b/none/tests/fdleak_fcntl.stderr.exp
index 1626954e70ac589aa4af21c6cb01cf2bfef0df40..50c5cd4e08b6ad2ddc1324458537f6dddbbaa5ce 100644 (file)
--- 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 .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_fcntl.stderr.exp2 b/none/tests/fdleak_fcntl.stderr.exp2
deleted file mode 100644 (file)
index 9d57cbe..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_fcntl.stderr.exp3 b/none/tests/fdleak_fcntl.stderr.exp3
deleted file mode 100644 (file)
index 0b907a8..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_fcntl.stderr.exp4 b/none/tests/fdleak_fcntl.stderr.exp4
deleted file mode 100644 (file)
index 872fd5c..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_ipv4.stderr.exp b/none/tests/fdleak_ipv4.stderr.exp
index 4317fe83f826eb8dc9cbd22c81ee306b169459a9..773080dcda0d17db9d2a72d6bada6499ebebcb38 100644 (file)
--- 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 .: .
    <inherited from parent>
@@ -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 .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_ipv4.stderr.exp2 b/none/tests/fdleak_ipv4.stderr.exp2
deleted file mode 100644 (file)
index ad2e664..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-
-
-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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_open.stderr.exp b/none/tests/fdleak_open.stderr.exp
index 089931fdc8ce68a01943394e0c2ce9a729ce4e35..ae14b421d5f1fba370f8dbe23367455aef9aab3f 100644 (file)
--- 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 .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_open.stderr.exp2 b/none/tests/fdleak_open.stderr.exp2
deleted file mode 100644 (file)
index c16d17c..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_pipe.stderr.exp b/none/tests/fdleak_pipe.stderr.exp
index c67b386480d589564eae507d4fad713a4f8387d8..a265af5c9c29814a0a157869a9e0b7000a1d7d20 100644 (file)
--- 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 .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_pipe.stderr.exp2 b/none/tests/fdleak_pipe.stderr.exp2
deleted file mode 100644 (file)
index 743f451..0000000
--- 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 .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/fdleak_socketpair.stderr.exp b/none/tests/fdleak_socketpair.stderr.exp
index f08267585791bf6524680181b27e88b377685bd3..666c56f805f31a36d7694df97ee999f8ca7e5aef 100644 (file)
--- 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 .: <unknown>
-   at 0x........: socketpair (in /...libc...)
-   by 0x........: (below main)
+   ...
 
 Open AF_UNIX socket .: <unknown>
-   at 0x........: socketpair (in /...libc...)
-   by 0x........: (below main)
+   ...
 
 Open file descriptor .: .
    <inherited from parent>

diff --git a/none/tests/fdleak_socketpair.stderr.exp2 b/none/tests/fdleak_socketpair.stderr.exp2
deleted file mode 100644 (file)
index 2075bad..0000000
--- a/none/tests/fdleak_socketpair.stderr.exp2
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-FILE DESCRIPTORS: 5 open at exit.
-Open AF_UNIX socket .: <unknown>
-   at 0x........: socketpair (in /...libc...)
-   by 0x........: main (fdleak_socketpair.c:15)
-
-Open AF_UNIX socket .: <unknown>
-   at 0x........: socketpair (in /...libc...)
-   by 0x........: main (fdleak_socketpair.c:15)
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: .
-   <inherited from parent>
-
-Open file descriptor .: /dev/null
-   <inherited from parent>
-
-

diff --git a/none/tests/filter_fdleak b/none/tests/filter_fdleak
index d4ed2325cbb23cb65398f2f4b78912bd432f5b38..64f97266d8c70e18b79933193f9243b5f7a784e6 100755 (executable)
--- 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'
+
+