From 10302c2e3cd5a04446a4c9fb4ece0beceed30373 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 Jan 2013 09:43:22 -0800
Subject: [PATCH] tests: don't assume fd 99 is closed

* tests/test-accept.c, tests/test-accept4.c, tests/test-bind.c:
* tests/test-close.c, tests/test-connect.c, tests/test-dprintf.c:
* tests/test-dup.c, tests/test-dup2.c, tests/test-faccessat.c:
* tests/test-fchdir.c, tests/test-fchmod.c, tests/test-fchmodat.c:
* tests/test-fchown.c, tests/test-fchownat.c, tests/test-fclose.c:
* tests/test-fdatasync.c, tests/test-fdopen.c, tests/test-fdopendir.c:
* tests/test-fflush.c, tests/test-fgetc.c, tests/test-fputc.c:
* tests/test-fread.c, tests/test-freopen.c, tests/test-fseeko4.c:
* tests/test-fstat.c, tests/test-fstatat.c, tests/test-fsync.c:
* tests/test-ftello4.c, tests/test-ftruncate.c, tests/test-futimens.h:
* tests/test-fwrite.c, tests/test-getpeername.c:
* tests/test-getsockname.c, tests/test-getsockopt.c:
* tests/test-grantpt.c, tests/test-ioctl.c, tests/test-isatty.c:
* tests/test-linkat.c, tests/test-listen.c, tests/test-lseek.c:
* tests/test-mkdirat.c, tests/test-mkfifoat.c, tests/test-openat.c:
* tests/test-pread.c, tests/test-pwrite.c, tests/test-read.c:
* tests/test-readlinkat.c, tests/test-recv.c, tests/test-recvfrom.c:
* tests/test-renameat.c, tests/test-select.h, tests/test-send.c:
* tests/test-sendto.c, tests/test-setsockopt.c, tests/test-shutdown.c:
* tests/test-symlinkat.c, tests/test-ttyname_r.c:
* tests/test-unlinkat.c, tests/test-unlockpt.c:
* tests/test-utimensat.c, tests/test-vdprintf.c, tests/test-write.c:
Close file descriptor 99, instead of assuming it's already closed.
---
 ChangeLog                | 27 +++++++++++++++++++++++++++
 tests/test-accept.c      |  1 +
 tests/test-accept4.c     |  1 +
 tests/test-bind.c        |  1 +
 tests/test-close.c       |  1 +
 tests/test-connect.c     |  1 +
 tests/test-dprintf.c     |  1 +
 tests/test-dup.c         |  1 +
 tests/test-dup2.c        |  1 +
 tests/test-faccessat.c   |  1 +
 tests/test-fchdir.c      |  1 +
 tests/test-fchmod.c      |  1 +
 tests/test-fchmodat.c    |  1 +
 tests/test-fchown.c      |  1 +
 tests/test-fchownat.c    |  1 +
 tests/test-fclose.c      |  4 +++-
 tests/test-fdatasync.c   |  1 +
 tests/test-fdopen.c      |  1 +
 tests/test-fdopendir.c   |  1 +
 tests/test-fflush.c      |  4 +++-
 tests/test-fgetc.c       |  4 +++-
 tests/test-fputc.c       |  4 +++-
 tests/test-fread.c       |  4 +++-
 tests/test-freopen.c     |  4 +++-
 tests/test-fseeko4.c     |  4 +++-
 tests/test-fstat.c       |  1 +
 tests/test-fstatat.c     |  1 +
 tests/test-fsync.c       |  1 +
 tests/test-ftello4.c     |  4 +++-
 tests/test-ftruncate.c   |  1 +
 tests/test-futimens.h    |  1 +
 tests/test-fwrite.c      |  4 +++-
 tests/test-getpeername.c |  1 +
 tests/test-getsockname.c |  1 +
 tests/test-getsockopt.c  |  1 +
 tests/test-grantpt.c     |  1 +
 tests/test-ioctl.c       |  1 +
 tests/test-isatty.c      |  1 +
 tests/test-linkat.c      |  1 +
 tests/test-listen.c      |  1 +
 tests/test-lseek.c       |  1 +
 tests/test-mkdirat.c     |  1 +
 tests/test-mkfifoat.c    |  1 +
 tests/test-openat.c      |  1 +
 tests/test-pread.c       |  1 +
 tests/test-pwrite.c      |  1 +
 tests/test-read.c        |  1 +
 tests/test-readlinkat.c  |  1 +
 tests/test-recv.c        |  1 +
 tests/test-recvfrom.c    |  1 +
 tests/test-renameat.c    |  1 +
 tests/test-select.h      |  1 +
 tests/test-send.c        |  1 +
 tests/test-sendto.c      |  1 +
 tests/test-setsockopt.c  |  1 +
 tests/test-shutdown.c    |  1 +
 tests/test-symlinkat.c   |  1 +
 tests/test-ttyname_r.c   |  4 +++-
 tests/test-unlinkat.c    |  1 +
 tests/test-unlockpt.c    |  1 +
 tests/test-utimensat.c   |  1 +
 tests/test-vdprintf.c    |  1 +
 tests/test-write.c       |  1 +
 63 files changed, 109 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d33d7fbda..61b629e61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2013-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	tests: don't assume fd 99 is closed
+	* tests/test-accept.c, tests/test-accept4.c, tests/test-bind.c:
+	* tests/test-close.c, tests/test-connect.c, tests/test-dprintf.c:
+	* tests/test-dup.c, tests/test-dup2.c, tests/test-faccessat.c:
+	* tests/test-fchdir.c, tests/test-fchmod.c, tests/test-fchmodat.c:
+	* tests/test-fchown.c, tests/test-fchownat.c, tests/test-fclose.c:
+	* tests/test-fdatasync.c, tests/test-fdopen.c, tests/test-fdopendir.c:
+	* tests/test-fflush.c, tests/test-fgetc.c, tests/test-fputc.c:
+	* tests/test-fread.c, tests/test-freopen.c, tests/test-fseeko4.c:
+	* tests/test-fstat.c, tests/test-fstatat.c, tests/test-fsync.c:
+	* tests/test-ftello4.c, tests/test-ftruncate.c, tests/test-futimens.h:
+	* tests/test-fwrite.c, tests/test-getpeername.c:
+	* tests/test-getsockname.c, tests/test-getsockopt.c:
+	* tests/test-grantpt.c, tests/test-ioctl.c, tests/test-isatty.c:
+	* tests/test-linkat.c, tests/test-listen.c, tests/test-lseek.c:
+	* tests/test-mkdirat.c, tests/test-mkfifoat.c, tests/test-openat.c:
+	* tests/test-pread.c, tests/test-pwrite.c, tests/test-read.c:
+	* tests/test-readlinkat.c, tests/test-recv.c, tests/test-recvfrom.c:
+	* tests/test-renameat.c, tests/test-select.h, tests/test-send.c:
+	* tests/test-sendto.c, tests/test-setsockopt.c, tests/test-shutdown.c:
+	* tests/test-symlinkat.c, tests/test-ttyname_r.c:
+	* tests/test-unlinkat.c, tests/test-unlockpt.c:
+	* tests/test-utimensat.c, tests/test-vdprintf.c, tests/test-write.c:
+	Close file descriptor 99, instead of assuming it's already closed.
+
 2013-01-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 	stpncpy: port to OS X 10.8
diff --git a/tests/test-accept.c b/tests/test-accept.c
index a2aaafbf7..2dec5b049 100644
--- a/tests/test-accept.c
+++ b/tests/test-accept.c
@@ -45,6 +45,7 @@ main (void)
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof (addr);
 
+    close (99);
     errno = 0;
     ASSERT (accept (99, (struct sockaddr *) &addr, &addrlen) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-accept4.c b/tests/test-accept4.c
index 85232cacc..05a56ce5d 100644
--- a/tests/test-accept4.c
+++ b/tests/test-accept4.c
@@ -50,6 +50,7 @@ main (void)
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof (addr);
 
+    close (99);
     errno = 0;
     ASSERT (accept4 (99, (struct sockaddr *) &addr, &addrlen,
                      O_CLOEXEC | O_BINARY)
diff --git a/tests/test-bind.c b/tests/test-bind.c
index 00bd8921e..1e8fa29cb 100644
--- a/tests/test-bind.c
+++ b/tests/test-bind.c
@@ -46,6 +46,7 @@ main (void)
       ASSERT (errno == EBADF);
     }
     {
+      close (99);
       errno = 0;
       ASSERT (bind (99, (const struct sockaddr *) &addr, sizeof (addr)) == -1);
       ASSERT (errno == EBADF);
diff --git a/tests/test-close.c b/tests/test-close.c
index 0df750af6..974ed1b6c 100644
--- a/tests/test-close.c
+++ b/tests/test-close.c
@@ -35,6 +35,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (close (99) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-connect.c b/tests/test-connect.c
index 76daa68b6..4527730cd 100644
--- a/tests/test-connect.c
+++ b/tests/test-connect.c
@@ -47,6 +47,7 @@ main (void)
       ASSERT (errno == EBADF);
     }
     {
+      close (99);
       errno = 0;
       ASSERT (connect (99, (const struct sockaddr *) &addr, sizeof (addr))
               == -1);
diff --git a/tests/test-dprintf.c b/tests/test-dprintf.c
index fcc8d51a8..89811077e 100644
--- a/tests/test-dprintf.c
+++ b/tests/test-dprintf.c
@@ -35,6 +35,7 @@ main (int argc, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (dprintf (99, "test") == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-dup.c b/tests/test-dup.c
index ba7d752e5..b2cf9357d 100644
--- a/tests/test-dup.c
+++ b/tests/test-dup.c
@@ -35,6 +35,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (dup (99) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-dup2.c b/tests/test-dup2.c
index 80514a19f..9600c850b 100644
--- a/tests/test-dup2.c
+++ b/tests/test-dup2.c
@@ -122,6 +122,7 @@ main (void)
   errno = 0;
   ASSERT (dup2 (-1, fd) == -1);
   ASSERT (errno == EBADF);
+  close (99);
   errno = 0;
   ASSERT (dup2 (99, fd) == -1);
   ASSERT (errno == EBADF);
diff --git a/tests/test-faccessat.c b/tests/test-faccessat.c
index e61f2ad5f..6a4641faf 100644
--- a/tests/test-faccessat.c
+++ b/tests/test-faccessat.c
@@ -36,6 +36,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (faccessat (99, "foo", F_OK, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fchdir.c b/tests/test-fchdir.c
index 723d4fc8f..7ffc71baa 100644
--- a/tests/test-fchdir.c
+++ b/tests/test-fchdir.c
@@ -51,6 +51,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fchdir (99) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fchmod.c b/tests/test-fchmod.c
index eaee7468d..bf576b60b 100644
--- a/tests/test-fchmod.c
+++ b/tests/test-fchmod.c
@@ -35,6 +35,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fchmod (99, 0600) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fchmodat.c b/tests/test-fchmodat.c
index 02f4e79a9..ed35c1b05 100644
--- a/tests/test-fchmodat.c
+++ b/tests/test-fchmodat.c
@@ -35,6 +35,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fchmodat (99, "foo", 0600, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fchown.c b/tests/test-fchown.c
index 31a865ea2..6ee3fe3e4 100644
--- a/tests/test-fchown.c
+++ b/tests/test-fchown.c
@@ -35,6 +35,7 @@ main (int argc, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fchown (99, getuid (), getgid ()) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fchownat.c b/tests/test-fchownat.c
index 5d5e193c2..c10651be2 100644
--- a/tests/test-fchownat.c
+++ b/tests/test-fchownat.c
@@ -76,6 +76,7 @@ main (int argc _GL_UNUSED, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fchownat (99, "foo", getuid (), getgid (), 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fclose.c b/tests/test-fclose.c
index 53f9d24e7..3fbecf12b 100644
--- a/tests/test-fclose.c
+++ b/tests/test-fclose.c
@@ -96,7 +96,9 @@ main (int argc, char **argv)
       }
   }
   {
-    FILE *fp = fdopen (99, "r");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "r");
     if (fp != NULL)
       {
         errno = 0;
diff --git a/tests/test-fdatasync.c b/tests/test-fdatasync.c
index 40b8d3d40..697701a2b 100644
--- a/tests/test-fdatasync.c
+++ b/tests/test-fdatasync.c
@@ -51,6 +51,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fdatasync (99) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fdopen.c b/tests/test-fdopen.c
index cf773a6cb..5603616c3 100644
--- a/tests/test-fdopen.c
+++ b/tests/test-fdopen.c
@@ -42,6 +42,7 @@ main (void)
   {
     FILE *fp;
 
+    close (99);
     errno = 0;
     fp = fdopen (99, "r");
     if (fp == NULL)
diff --git a/tests/test-fdopendir.c b/tests/test-fdopendir.c
index a8e115a1f..a9e2a9312 100644
--- a/tests/test-fdopendir.c
+++ b/tests/test-fdopendir.c
@@ -54,6 +54,7 @@ main (int argc _GL_UNUSED, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fdopendir (99) == NULL);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fflush.c b/tests/test-fflush.c
index 4f83b15f3..1c61140b3 100644
--- a/tests/test-fflush.c
+++ b/tests/test-fflush.c
@@ -172,7 +172,9 @@ main (void)
       }
   }
   {
-    FILE *fp = fdopen (99, "w");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "w");
     if (fp != NULL)
       {
         fputc ('x', fp);
diff --git a/tests/test-fgetc.c b/tests/test-fgetc.c
index 67529bb62..b4a617aae 100644
--- a/tests/test-fgetc.c
+++ b/tests/test-fgetc.c
@@ -77,7 +77,9 @@ main (int argc, char **argv)
       }
   }
   {
-    FILE *fp = fdopen (99, "r");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "r");
     if (fp != NULL)
       {
         errno = 0;
diff --git a/tests/test-fputc.c b/tests/test-fputc.c
index 7bf7f1cbb..e05f641ed 100644
--- a/tests/test-fputc.c
+++ b/tests/test-fputc.c
@@ -70,7 +70,9 @@ main (int argc, char **argv)
       }
   }
   {
-    FILE *fp = fdopen (99, "w");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "w");
     if (fp != NULL)
       {
         setvbuf (fp, NULL, _IONBF, 0);
diff --git a/tests/test-fread.c b/tests/test-fread.c
index 698e53441..a807e0a86 100644
--- a/tests/test-fread.c
+++ b/tests/test-fread.c
@@ -79,7 +79,9 @@ main (int argc, char **argv)
       }
   }
   {
-    FILE *fp = fdopen (99, "r");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "r");
     if (fp != NULL)
       {
         char buf[1];
diff --git a/tests/test-freopen.c b/tests/test-freopen.c
index c01aa88ca..4b54d8d52 100644
--- a/tests/test-freopen.c
+++ b/tests/test-freopen.c
@@ -62,7 +62,9 @@ main ()
       }
   }
   {
-    FILE *fp = fdopen (99, "w+");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "w+");
     if (fp != NULL)
       {
         errno = 0;
diff --git a/tests/test-fseeko4.c b/tests/test-fseeko4.c
index 5e8167e72..8d6d58a46 100644
--- a/tests/test-fseeko4.c
+++ b/tests/test-fseeko4.c
@@ -57,7 +57,9 @@ main (int argc, char **argv)
       }
   }
   {
-    FILE *fp = fdopen (99, "w");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "w");
     if (fp != NULL)
       {
         errno = 0;
diff --git a/tests/test-fstat.c b/tests/test-fstat.c
index 49b483865..0f6322935 100644
--- a/tests/test-fstat.c
+++ b/tests/test-fstat.c
@@ -39,6 +39,7 @@ main (int argc, char *argv[])
   {
     struct stat statbuf;
 
+    close (99);
     errno = 0;
     ASSERT (fstat (99, &statbuf) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index 9b243e56b..83e184f02 100644
--- a/tests/test-fstatat.c
+++ b/tests/test-fstatat.c
@@ -78,6 +78,7 @@ main (int argc _GL_UNUSED, char *argv[])
   {
     struct stat statbuf;
 
+    close (99);
     errno = 0;
     ASSERT (fstatat (99, "foo", &statbuf, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fsync.c b/tests/test-fsync.c
index 588f402fe..d21d36152 100644
--- a/tests/test-fsync.c
+++ b/tests/test-fsync.c
@@ -51,6 +51,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (fsync (99) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-ftello4.c b/tests/test-ftello4.c
index 1b6f6c66b..b8cd679ac 100644
--- a/tests/test-ftello4.c
+++ b/tests/test-ftello4.c
@@ -54,7 +54,9 @@ main (int argc, char **argv)
       }
   }
   {
-    FILE *fp = fdopen (99, "w");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "w");
     if (fp != NULL)
       {
         errno = 0;
diff --git a/tests/test-ftruncate.c b/tests/test-ftruncate.c
index 820d471c9..8b795a87a 100644
--- a/tests/test-ftruncate.c
+++ b/tests/test-ftruncate.c
@@ -38,6 +38,7 @@ main (int argc, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (ftruncate (99, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-futimens.h b/tests/test-futimens.h
index 4ae7d199a..96eca5175 100644
--- a/tests/test-futimens.h
+++ b/tests/test-futimens.h
@@ -83,6 +83,7 @@ test_futimens (int (*func) (int, struct timespec const *),
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (func (99, NULL) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-fwrite.c b/tests/test-fwrite.c
index 671c033cf..ef72338d7 100644
--- a/tests/test-fwrite.c
+++ b/tests/test-fwrite.c
@@ -72,7 +72,9 @@ main (int argc, char **argv)
       }
   }
   {
-    FILE *fp = fdopen (99, "w");
+    FILE *fp;
+    close (99);
+    fp = fdopen (99, "w");
     if (fp != NULL)
       {
         char buf[5] = "world";
diff --git a/tests/test-getpeername.c b/tests/test-getpeername.c
index 1b0348071..bd82e9658 100644
--- a/tests/test-getpeername.c
+++ b/tests/test-getpeername.c
@@ -45,6 +45,7 @@ main (void)
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof (addr);
 
+    close (99);
     errno = 0;
     ASSERT (getpeername (99, (struct sockaddr *) &addr, &addrlen) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-getsockname.c b/tests/test-getsockname.c
index 421d8181d..617b0a700 100644
--- a/tests/test-getsockname.c
+++ b/tests/test-getsockname.c
@@ -45,6 +45,7 @@ main (void)
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof (addr);
 
+    close (99);
     errno = 0;
     ASSERT (getsockname (99, (struct sockaddr *) &addr, &addrlen) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-getsockopt.c b/tests/test-getsockopt.c
index 4bd1a4edd..38158ae35 100644
--- a/tests/test-getsockopt.c
+++ b/tests/test-getsockopt.c
@@ -45,6 +45,7 @@ main (void)
     int value;
     socklen_t value_len = sizeof (value);
 
+    close (99);
     errno = 0;
     ASSERT (getsockopt (99, SOL_SOCKET, SO_REUSEADDR, &value, &value_len)
             == -1);
diff --git a/tests/test-grantpt.c b/tests/test-grantpt.c
index fbef804a1..4665b3258 100644
--- a/tests/test-grantpt.c
+++ b/tests/test-grantpt.c
@@ -48,6 +48,7 @@ main (void)
   {
     int ret;
 
+    close (99);
     errno = 0;
     ret = grantpt (99);
     if (ret != 0)
diff --git a/tests/test-ioctl.c b/tests/test-ioctl.c
index c3019865a..20ecb9903 100644
--- a/tests/test-ioctl.c
+++ b/tests/test-ioctl.c
@@ -39,6 +39,7 @@ main (void)
   }
   {
     int value;
+    close (99);
     errno = 0;
     ASSERT (ioctl (99, FIONREAD, &value) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-isatty.c b/tests/test-isatty.c
index 046c16074..8441ff8a6 100644
--- a/tests/test-isatty.c
+++ b/tests/test-isatty.c
@@ -49,6 +49,7 @@ main (void)
            );
   }
   {
+    close (99);
     errno = 0;
     ASSERT (isatty (99) == 0);
     ASSERT (errno == EBADF
diff --git a/tests/test-linkat.c b/tests/test-linkat.c
index 6be925a6c..6d55f1037 100644
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -102,6 +102,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (linkat (99, "foo", AT_FDCWD, "bar", 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-listen.c b/tests/test-listen.c
index 33e8a6a1a..3f28b65f6 100644
--- a/tests/test-listen.c
+++ b/tests/test-listen.c
@@ -38,6 +38,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (listen (99 ,1) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-lseek.c b/tests/test-lseek.c
index a45337b13..67d334133 100644
--- a/tests/test-lseek.c
+++ b/tests/test-lseek.c
@@ -95,6 +95,7 @@ main (int argc, char **argv)
       ASSERT (lseek (-1, (off_t)0, SEEK_CUR) == -1);
       ASSERT (errno == EBADF);
 
+      close (99);
       errno = 0;
       ASSERT (lseek (99, (off_t)0, SEEK_CUR) == -1);
       ASSERT (errno == EBADF);
diff --git a/tests/test-mkdirat.c b/tests/test-mkdirat.c
index f0b64c34f..90b3807d9 100644
--- a/tests/test-mkdirat.c
+++ b/tests/test-mkdirat.c
@@ -64,6 +64,7 @@ main (int argc _GL_UNUSED, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (mkdirat (99, "foo", 0700) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-mkfifoat.c b/tests/test-mkfifoat.c
index e38ae9a54..86b821ed0 100644
--- a/tests/test-mkfifoat.c
+++ b/tests/test-mkfifoat.c
@@ -98,6 +98,7 @@ main (void)
                );
       }
       {
+        close (99);
         errno = 0;
         ASSERT (func (99, "foo", 0600) == -1);
         ASSERT (errno == EBADF
diff --git a/tests/test-openat.c b/tests/test-openat.c
index e10db7a4b..1ef07b5b1 100644
--- a/tests/test-openat.c
+++ b/tests/test-openat.c
@@ -72,6 +72,7 @@ main (int argc _GL_UNUSED, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (openat (99, "foo", O_RDONLY) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-pread.c b/tests/test-pread.c
index e5473d641..4416bd162 100644
--- a/tests/test-pread.c
+++ b/tests/test-pread.c
@@ -92,6 +92,7 @@ main (void)
   }
   {
     char byte;
+    close (99);
     errno = 0;
     ASSERT (pread (99, &byte, 1, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-pwrite.c b/tests/test-pwrite.c
index 30660beaa..c9cb09469 100644
--- a/tests/test-pwrite.c
+++ b/tests/test-pwrite.c
@@ -86,6 +86,7 @@ main (void)
   }
   {
     char byte = 'x';
+    close (99);
     errno = 0;
     ASSERT (pwrite (99, &byte, 1, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-read.c b/tests/test-read.c
index 9f2543090..74b5b4df1 100644
--- a/tests/test-read.c
+++ b/tests/test-read.c
@@ -60,6 +60,7 @@ main (void)
   }
   {
     char byte;
+    close (99);
     errno = 0;
     ASSERT (read (99, &byte, 1) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-readlinkat.c b/tests/test-readlinkat.c
index bb6b7b3b5..c2ce6ef7e 100644
--- a/tests/test-readlinkat.c
+++ b/tests/test-readlinkat.c
@@ -66,6 +66,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (readlinkat (99, "foo", buf, sizeof buf) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-recv.c b/tests/test-recv.c
index cf414a159..1605db569 100644
--- a/tests/test-recv.c
+++ b/tests/test-recv.c
@@ -40,6 +40,7 @@ main (void)
   }
   {
     char byte;
+    close (99);
     errno = 0;
     ASSERT (recv (99, &byte, 1, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-recvfrom.c b/tests/test-recvfrom.c
index f4efb7194..dc83329fb 100644
--- a/tests/test-recvfrom.c
+++ b/tests/test-recvfrom.c
@@ -50,6 +50,7 @@ main (void)
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof (addr);
 
+    close (99);
     errno = 0;
     ASSERT (recvfrom (99, &byte, 1, 0, (struct sockaddr *) &addr, &addrlen)
             == -1);
diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index 2ee772d62..bfa988ca2 100644
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -68,6 +68,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (renameat (99, "foo", AT_FDCWD, "bar") == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-select.h b/tests/test-select.h
index c2e215b23..75c8fb1ab 100644
--- a/tests/test-select.h
+++ b/tests/test-select.h
@@ -297,6 +297,7 @@ test_bad_fd (select_fn my_select)
 # else
   fd = 99;
 # endif
+  close (fd);
 
   if (do_select_bad_fd_nowait (fd, SEL_IN, my_select) == 0 || errno != EBADF)
     failed ("invalid fd among rfds");
diff --git a/tests/test-send.c b/tests/test-send.c
index 87b34434e..d7af0fe0b 100644
--- a/tests/test-send.c
+++ b/tests/test-send.c
@@ -40,6 +40,7 @@ main (void)
   }
   {
     char byte = 'x';
+    close (99);
     errno = 0;
     ASSERT (send (99, &byte, 1, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-sendto.c b/tests/test-sendto.c
index 8a0651116..a99a22149 100644
--- a/tests/test-sendto.c
+++ b/tests/test-sendto.c
@@ -52,6 +52,7 @@ main (void)
     }
     {
       char byte = 'x';
+      close (99);
       errno = 0;
       ASSERT (sendto (99, &byte, 1, 0,
                       (const struct sockaddr *) &addr, sizeof (addr))
diff --git a/tests/test-setsockopt.c b/tests/test-setsockopt.c
index ade75e8e4..824d46c89 100644
--- a/tests/test-setsockopt.c
+++ b/tests/test-setsockopt.c
@@ -43,6 +43,7 @@ main (void)
   {
     int value = 1;
 
+    close (99);
     errno = 0;
     ASSERT (setsockopt (99, SOL_SOCKET, SO_REUSEADDR, &value, sizeof (value))
             == -1);
diff --git a/tests/test-shutdown.c b/tests/test-shutdown.c
index 49df75a62..ae20706b2 100644
--- a/tests/test-shutdown.c
+++ b/tests/test-shutdown.c
@@ -38,6 +38,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (shutdown (99, SHUT_RD) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-symlinkat.c b/tests/test-symlinkat.c
index 149192d9d..11d383516 100644
--- a/tests/test-symlinkat.c
+++ b/tests/test-symlinkat.c
@@ -67,6 +67,7 @@ main (void)
            );
   }
   {
+    close (99);
     errno = 0;
     ASSERT (symlinkat ("foo", 99, "bar") == -1);
     ASSERT (errno == EBADF
diff --git a/tests/test-ttyname_r.c b/tests/test-ttyname_r.c
index f1f663f4d..980d14e5b 100644
--- a/tests/test-ttyname_r.c
+++ b/tests/test-ttyname_r.c
@@ -55,7 +55,9 @@ main (void)
            );
   }
   {
-    int err = ttyname_r (99, buf, sizeof (buf));
+    int err;
+    close (99);
+    err = ttyname_r (99, buf, sizeof (buf));
     ASSERT (err == EBADF
             || err == ENOTTY /* seen on FreeBSD 6.4 */
            );
diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index 74b2ac636..430d1891c 100644
--- a/tests/test-unlinkat.c
+++ b/tests/test-unlinkat.c
@@ -75,6 +75,7 @@ main (int argc _GL_UNUSED, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (unlinkat (99, "foo", 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-unlockpt.c b/tests/test-unlockpt.c
index 5cced0bcb..55fd9805a 100644
--- a/tests/test-unlockpt.c
+++ b/tests/test-unlockpt.c
@@ -38,6 +38,7 @@ main (void)
            );
   }
   {
+    close (99);
     errno = 0;
     ASSERT (unlockpt (99) == -1);
     ASSERT (errno == EBADF
diff --git a/tests/test-utimensat.c b/tests/test-utimensat.c
index b2875b49e..439bf250d 100644
--- a/tests/test-utimensat.c
+++ b/tests/test-utimensat.c
@@ -76,6 +76,7 @@ main (void)
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (utimensat (99, "foo", NULL, 0) == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-vdprintf.c b/tests/test-vdprintf.c
index 5ce9d354b..024cc742b 100644
--- a/tests/test-vdprintf.c
+++ b/tests/test-vdprintf.c
@@ -47,6 +47,7 @@ main (int argc, char *argv[])
     ASSERT (errno == EBADF);
   }
   {
+    close (99);
     errno = 0;
     ASSERT (my_dprintf (99, "test") == -1);
     ASSERT (errno == EBADF);
diff --git a/tests/test-write.c b/tests/test-write.c
index f14fd6b5f..90e9a222a 100644
--- a/tests/test-write.c
+++ b/tests/test-write.c
@@ -66,6 +66,7 @@ main (void)
   }
   {
     char byte = 'x';
+    close (99);
     errno = 0;
     ASSERT (write (99, &byte, 1) == -1);
     ASSERT (errno == EBADF);
-- 
2.11.0