X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-unlinkat.c;h=430d1891c24755cdb085e2ab36f6a133fb194cad;hb=c9451e3bdc651a742f06b46a450497e59bb5e006;hp=785ede4cae79d9a5d70380819c4b8860b53abff5;hpb=7eba2f98240cd9a9c0cc81b4ebb7103bbe8630a7;p=gnulib.git

diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index 785ede4ca..430d1891c 100644
--- a/tests/test-unlinkat.c
+++ b/tests/test-unlinkat.c
@@ -1,5 +1,5 @@
 /* Tests of unlinkat.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2013 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 <unistd.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (unlinkat, int, (int, char const *, int));
+
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>
@@ -27,19 +30,10 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
+#include "progname.h"
 #include "unlinkdir.h"
-
-#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-unlinkat.t"
 
@@ -63,11 +57,30 @@ unlinker (char const *name)
 }
 
 int
-main ()
+main (int argc _GL_UNUSED, char *argv[])
 {
   /* FIXME: Add tests of fd other than ".".  */
   int result1;
   int result2;
+
+  set_program_name (argv[0]);
+
+  /* Remove any leftovers from a previous partial run.  */
+  ignore_value (system ("rm -rf " BASE "*"));
+
+  /* Test behaviour for invalid file descriptors.  */
+  {
+    errno = 0;
+    ASSERT (unlinkat (-1, "foo", 0) == -1);
+    ASSERT (errno == EBADF);
+  }
+  {
+    close (99);
+    errno = 0;
+    ASSERT (unlinkat (99, "foo", 0) == -1);
+    ASSERT (errno == EBADF);
+  }
+
   result1 = test_rmdir_func (rmdirat, false);
   result2 = test_unlink_func (unlinker, false);
   ASSERT (result1 == result2);
@@ -79,7 +92,7 @@ main ()
   ASSERT (result1 == result2);
   ASSERT (close (dfd) == 0);
   if (result1 == 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 result1;
 }