striconveh: Simplify last commit.

[gnulib.git] / tests / test-fstatat.c

diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index 552bf45..63e5a13 100644 (file)
--- 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, 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
@@ -33,18 +33,8 @@ SIGNATURE_CHECK (fstatat, int, (int, char const *, struct stat *, int));
 #include "openat.h"
 #include "pathmax.h"
 #include "same-inode.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-fstatat.t"
 
@@ -71,6 +61,10 @@ int
 main (void)
 {
   int result;
+
+  /* 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);