X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-unlinkat.c;h=7d805743842540aa4df4d4fd49471bb201a85a14;hb=692679fcbebba0095bae0f1f1a99bd1f0f5a0476;hp=313cf1ebf28cedc4558e435febecbb2e68644f11;hpb=89ae4589dd58d12e7cbcf0e92c1d828c1e430f97;p=gnulib.git

diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index 313cf1ebf..7d8057438 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
@@ -31,18 +31,8 @@ SIGNATURE_CHECK (unlinkat, int, (int, char const *, int));
 #include <sys/stat.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"
 
@@ -71,6 +61,10 @@ main (void)
   /* FIXME: Add tests of fd other than ".".  */
   int result1;
   int result2;
+
+  /* Remove any leftovers from a previous partial run.  */
+  ignore_value (system ("rm -rf " BASE "*"));
+
   result1 = test_rmdir_func (rmdirat, false);
   result2 = test_unlink_func (unlinker, false);
   ASSERT (result1 == result2);