X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-fstatat.c;h=839dad6c372001558f2aef93b4d5966063f8bae8;hb=5e5009f839875220d5dec7abdf5cf53d919f4d42;hp=a70721a79d9485d2f64186e9a8989eb0f21bafec;hpb=3a5041b1c62c2b7c829f47bec2f1789c59844b6c;p=gnulib.git

diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index a70721a79..839dad6c3 100644
--- a/tests/test-fstatat.c
+++ b/tests/test-fstatat.c
@@ -1,5 +1,5 @@
 /* Tests of fstatat.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 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
@@ -20,6 +20,9 @@
 
 #include <sys/stat.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (fstatat, int, (int, char const *, struct stat *, int));
+
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>
@@ -30,22 +33,8 @@
 #include "openat.h"
 #include "pathmax.h"
 #include "same-inode.h"
-
-#if !HAVE_SYMLINK
-# define symlink(a,b) (-1)
-#endif
-
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-	{                                                                    \
-	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__);  \
-	  fflush (stderr);                                                   \
-	  abort ();                                                          \
-	}                                                                    \
-    }                                                                        \
-  while (0)
+#include "ignore-value.h"
+#include "macros.h"
 
 #define BASE "test-fstatat.t"
 
@@ -69,21 +58,25 @@ do_lstat (char const *name, struct stat *st)
 }
 
 int
-main ()
+main (void)
 {
   int result;
-  ASSERT (test_stat_func (do_stat) == 0);
-  result = test_lstat_func (do_lstat, false);
+
+  /* Remove any leftovers from a previous partial run.  */
+  ignore_value (system ("rm -rf " BASE "*"));
+
+  result = test_stat_func (do_stat, false);
+  ASSERT (test_lstat_func (do_lstat, false) == result);
   dfd = open (".", O_RDONLY);
   ASSERT (0 <= dfd);
-  ASSERT (test_stat_func (do_stat) == 0);
+  ASSERT (test_stat_func (do_stat, false) == result);
   ASSERT (test_lstat_func (do_lstat, false) == result);
   ASSERT (close (dfd) == 0);
 
   /* FIXME - add additional tests of dfd not at current directory.  */
 
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
-	   stderr);
+    fputs ("skipping test: symlinks not supported on this file system\n",
+           stderr);
   return result;
 }