X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-rmdir.c;h=3531de96b91dc674e8f6d99e56f8117221bfbe26;hb=7f45e1ae3741d0e03657c0c883e9b6cd1591f87c;hp=d7e4da349d35dfeb7b661ec84d6aa1e9f1a05a4a;hpb=ff4e8f6b53d7b8c53856ba8ba2adaad3251e6a88;p=gnulib.git

diff --git a/tests/test-rmdir.c b/tests/test-rmdir.c
index d7e4da349..3531de96b 100644
--- a/tests/test-rmdir.c
+++ b/tests/test-rmdir.c
@@ -1,5 +1,5 @@
 /* Tests of rmdir.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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 (rmdir, int, (char const *));
+
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>
@@ -27,28 +30,18 @@
 #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 "ignore-value.h"
+#include "macros.h"
 
 #define BASE "test-rmdir.t"
 
 #include "test-rmdir.h"
 
 int
-main ()
+main (void)
 {
+  /* Remove any leftovers from a previous partial run.  */
+  ignore_value (system ("rm -rf " BASE "*"));
+
   return test_rmdir_func (rmdir, true);
 }