X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-unlinkat.c;h=e0cc1c5a51c467c3e2be8b2a97f1a231d40a438e;hb=4818e199e6df0569802336b58277b2d633a23ddd;hp=fb87a19ed76cfd642f18180204bda04d0f2595b1;hpb=fc8289d694095c8e5def3078a2557e122dcf459b;p=gnulib.git

diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index fb87a19ed..e0cc1c5a5 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, 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
@@ -20,42 +20,62 @@
 
 #include <unistd.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (unlinkat, int, (int, char const *, int));
+
 #include <fcntl.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.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 "unlinkdir.h"
+#include "macros.h"
 
 #define BASE "test-unlinkat.t"
 
 #include "test-rmdir.h"
+#include "test-unlink.h"
+
+static int dfd = AT_FDCWD;
 
 /* Wrapper around unlinkat to test rmdir behavior.  */
 static int
 rmdirat (char const *name)
 {
-  return unlinkat (AT_FDCWD, name, AT_REMOVEDIR);
+  return unlinkat (dfd, name, AT_REMOVEDIR);
+}
+
+/* Wrapper around unlinkat to test unlink behavior.  */
+static int
+unlinker (char const *name)
+{
+  return unlinkat (dfd, name, 0);
 }
 
 int
-main ()
+main (void)
 {
-  /* FIXME: Add tests of unlinkat(,0), and of fd instead of AT_FDCWD.  */
-  return test_rmdir_func (rmdirat);
+  /* FIXME: Add tests of fd other than ".".  */
+  int result1;
+  int result2;
+
+  /* Remove any leftovers from a previous partial run.  */
+  system ("rm -rf " BASE "*");
+
+  result1 = test_rmdir_func (rmdirat, false);
+  result2 = test_unlink_func (unlinker, false);
+  ASSERT (result1 == result2);
+  dfd = open (".", O_RDONLY);
+  ASSERT (0 <= dfd);
+  result2 = test_rmdir_func (rmdirat, false);
+  ASSERT (result1 == result2);
+  result2 = test_unlink_func (unlinker, false);
+  ASSERT (result1 == result2);
+  ASSERT (close (dfd) == 0);
+  if (result1 == 77)
+    fputs ("skipping test: symlinks not supported on this file system\n",
+           stderr);
+  return result1;
 }