X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-renameat.c;h=e5fefa1f5df62d8d70d2efdee1dbabaa63e0fd84;hb=c886605fb18a77672345c3a171e0f76818d409b8;hp=88c0cb08e6970a2a1c2e97d98834e1a12c488c18;hpb=82381b9e5b37125305709d412d8322b35e5c4796;p=gnulib.git

diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index 88c0cb08e..e5fefa1f5 100644
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -1,5 +1,5 @@
 /* Tests of renameat.
-   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,6 +20,9 @@
 
 #include <stdio.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (renameat, int, (int, char const *, int, char const *));
+
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>
@@ -29,18 +32,8 @@
 
 #include "filenamecat.h"
 #include "xgetcwd.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-renameat.t"
 
@@ -65,7 +58,7 @@ main (void)
   int result;
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  ignore_value (system ("rm -rf " BASE "*"));
 
   /* Test basic rename functionality, using current directory.  */
   result = test_rename (do_rename, false);
@@ -134,7 +127,8 @@ main (void)
   ASSERT (unlink (BASE "sub2/file") == 0);
   errno = 0;
   ASSERT (renameat (dfd, BASE "sub2", dfd, BASE "sub1/.") == -1);
-  ASSERT (errno == EINVAL || errno == EISDIR || errno == EBUSY);
+  ASSERT (errno == EINVAL || errno == EISDIR || errno == EBUSY
+          || errno == ENOTEMPTY);
   errno = 0;
   ASSERT (renameat (dfd, BASE "sub2/.", dfd, BASE "sub1") == -1);
   ASSERT (errno == EINVAL || errno == EBUSY);