From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Fri, 15 Mar 2024 21:15:25 +0000 (+0100)
Subject: resgtest: close inherited file desctiptors in none file_dclose and socket_close
X-Git-Tag: VALGRIND_3_23_0~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a7f7c98ec7232ae59c1fbd818327da487b760bc;p=thirdparty%2Fvalgrind.git

resgtest: close inherited file desctiptors in none file_dclose and socket_close
---

diff --git a/none/tests/file_dclose.c b/none/tests/file_dclose.c
index 8856fa670..b3f864ef9 100644
--- a/none/tests/file_dclose.c
+++ b/none/tests/file_dclose.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include "fdleak.h"
 
 static int
 openfile (const char *f)
@@ -19,6 +20,8 @@ closefile (const char *f, int fd)
 
 int main ()
 {
+   CLOSE_INHERITED_FDS;
+
    const char *TMPFILE = "file_dclose.tmp";
    int fd;
 
diff --git a/none/tests/file_dclose.stderr.exp b/none/tests/file_dclose.stderr.exp
index d27648d2d..fa14b56b3 100644
--- a/none/tests/file_dclose.stderr.exp
+++ b/none/tests/file_dclose.stderr.exp
@@ -2,12 +2,12 @@ close 3
 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:16)
-   by 0x........: main (file_dclose.c:32)
+   by 0x........: closefile (file_dclose.c:17)
+   by 0x........: main (file_dclose.c:35)
  Previously closed
    at 0x........: close (in /...libc...)
-   by 0x........: main (file_dclose.c:28)
+   by 0x........: main (file_dclose.c:31)
  Originally opened
    at 0x........: creat (in /...libc...)
-   by 0x........: openfile (file_dclose.c:10)
-   by 0x........: main (file_dclose.c:25)
+   by 0x........: openfile (file_dclose.c:11)
+   by 0x........: main (file_dclose.c:28)
diff --git a/none/tests/socket_close.c b/none/tests/socket_close.c
index 402c0a5d5..59d70c000 100644
--- a/none/tests/socket_close.c
+++ b/none/tests/socket_close.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/un.h>
+#include "fdleak.h"
 
 const char *SPATH = "/tmp/vgtest-foofrob";
 int socket_fd;
@@ -25,6 +26,8 @@ void open_socket()
 
 int main ()
 {
+  CLOSE_INHERITED_FDS;
+
   open_socket();
 
   if (socket_fd != -1)
diff --git a/none/tests/socket_close.stderr.exp b/none/tests/socket_close.stderr.exp
index 74b06244d..884662046 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:37)
+   by 0x........: main (socket_close.c:40)
  Previously closed
    at 0x........: close (in /...libc...)
-   by 0x........: main (socket_close.c:33)
+   by 0x........: main (socket_close.c:36)
  Originally opened
    at 0x........: socket (in /...libc...)
-   by 0x........: open_socket (socket_close.c:16)
-   by 0x........: main (socket_close.c:28)
+   by 0x........: open_socket (socket_close.c:17)
+   by 0x........: main (socket_close.c:31)