On SuSE 10.1 (amd64) fd 4 seems to be open at process start. Close it

so as to get consistent test results.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6392

diff --git a/none/tests/fdleak_cmsg.c b/none/tests/fdleak_cmsg.c
index ecbd0eb59bda637eef656f6974814d5c9a94fe2a..d376bf4f9e5f7161f54846d86a8bb669245d0247 100644 (file)
--- a/none/tests/fdleak_cmsg.c
+++ b/none/tests/fdleak_cmsg.c
@@ -184,7 +184,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    pid = getpid();
    sprintf(filea, "/tmp/data1.%d", pid);

diff --git a/none/tests/fdleak_creat.c b/none/tests/fdleak_creat.c
index 9a2aaf1e17fdf777374e654c631e685d230b712a..5ff356b48e28684773f0efb979c96754f0eb8868 100644 (file)
--- a/none/tests/fdleak_creat.c
+++ b/none/tests/fdleak_creat.c
@@ -12,7 +12,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    sprintf(filename, "/tmp/file.%d\n", getpid());
    creat(filename, 0);

diff --git a/none/tests/fdleak_dup.c b/none/tests/fdleak_dup.c
index db8a287461e3f51137a61ac78f6d25596c8de76c..a0b9b81f347abdeba7a5dc81ba8a96fa68ffe4e7 100644 (file)
--- a/none/tests/fdleak_dup.c
+++ b/none/tests/fdleak_dup.c
@@ -11,7 +11,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    s = open("/dev/null", O_RDONLY);
    dup(s);

diff --git a/none/tests/fdleak_dup2.c b/none/tests/fdleak_dup2.c
index bcc8ff4a1b1fd66f27fdfc9abb5cc059721f37b3..14c59f4ec5efa42c4608b0115ada02fbe79cadeb 100644 (file)
--- a/none/tests/fdleak_dup2.c
+++ b/none/tests/fdleak_dup2.c
@@ -12,7 +12,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    s1 = open("/dev/null", O_RDONLY);
    s2 = open("/dev/null", O_RDONLY);

diff --git a/none/tests/fdleak_fcntl.c b/none/tests/fdleak_fcntl.c
index e2ea4f4a098e74234b151e0283faace150314121..0fee1db1efcf6fe7e1c1a43871a55cefab8c1974 100644 (file)
--- a/none/tests/fdleak_fcntl.c
+++ b/none/tests/fdleak_fcntl.c
@@ -12,7 +12,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    s1 = open("/dev/null", O_RDONLY);
    if(fcntl(s1, F_DUPFD, s1) == -1) perror("fcntl");

diff --git a/none/tests/fdleak_ipv4.c b/none/tests/fdleak_ipv4.c
index 98d28aee203618183b7bd18a87590e8e26ac71ff..b450dabcb3191f07ed3d5cded652833e9eddacf6 100644 (file)
--- a/none/tests/fdleak_ipv4.c
+++ b/none/tests/fdleak_ipv4.c
@@ -94,7 +94,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    if((pid = fork()) == 0) {
       server();

diff --git a/none/tests/fdleak_open.c b/none/tests/fdleak_open.c
index 22b4228d848543240214cbdcd82395d3618651ca..bf9dc395e6f7fa3a4c6fb894a6862e2ad69b15e8 100644 (file)
--- a/none/tests/fdleak_open.c
+++ b/none/tests/fdleak_open.c
@@ -8,7 +8,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    open("/dev/null", O_RDONLY);
    return 0;

diff --git a/none/tests/fdleak_socketpair.c b/none/tests/fdleak_socketpair.c
index da3e91204e29c9dd3c6335dec94e870f52770185..9c71cd471763ecb1b3d0802ace7e52d4c5d632c9 100644 (file)
--- a/none/tests/fdleak_socketpair.c
+++ b/none/tests/fdleak_socketpair.c
@@ -10,7 +10,7 @@ main (int argc, char **argv)
     * now to get consistent results across different releases.
     */
 
-   close(10);
+   close(10);  close(4);
 
    socketpair(AF_UNIX, SOCK_STREAM, PF_UNIX, fds);
    return 0;