X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-dirent-safer.c;h=dc8b6a229f2f3dd66e7c5b5b06a18b1a90bf0a0f;hb=69c6204c668c6f6821d2b126f88092baf8bfc8d4;hp=8d5d529282734075ec8345706d640fb1609834a3;hpb=82381b9e5b37125305709d412d8322b35e5c4796;p=gnulib.git

diff --git a/tests/test-dirent-safer.c b/tests/test-dirent-safer.c
index 8d5d52928..dc8b6a229 100644
--- a/tests/test-dirent-safer.c
+++ b/tests/test-dirent-safer.c
@@ -1,5 +1,5 @@
 /* Test that directory streams leave standard fds alone.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "unistd-safer.h"
@@ -33,19 +32,10 @@
    duplicate the original stderr.  */
 
 #define BACKUP_STDERR_FILENO 10
-static FILE *myerr;
+#define ASSERT_STREAM myerr
+#include "macros.h"
 
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (myerr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-          fflush (myerr);                                                    \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+static FILE *myerr;
 
 int
 main (void)
@@ -58,7 +48,7 @@ main (void)
      gnulib version of fdopendir is unable to guarantee that
      dirfd(fdopendir(fd))==fd, but we can at least guarantee that if
      they are not equal, the fd returned by dirfd is safe.  */
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
   int dfd;
 #endif
 
@@ -67,7 +57,7 @@ main (void)
       || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL)
     return 2;
 
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
   dfd = open (".", O_RDONLY);
   ASSERT (STDERR_FILENO < dfd);
 #endif
@@ -83,7 +73,7 @@ main (void)
       ASSERT (dirfd (dp) == -1 || STDERR_FILENO < dirfd (dp));
       ASSERT (closedir (dp) == 0);
 
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
       {
         int fd = dup_safer (dfd);
         ASSERT (STDERR_FILENO < fd);
@@ -98,7 +88,7 @@ main (void)
 #endif
     }
 
-#if HAVE_FDOPENDIR || GNULIB_FDOPENDIR
+#if HAVE_FDOPENDIR || GNULIB_TEST_FDOPENDIR
   ASSERT (close (dfd) == 0);
 #endif