X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-rmdir.c;h=8a24a688a43ab10133aced5dd4cb4d84434313ae;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=9d8eb5ab0b5be5872d7bb5ad6ab2544ef8d8a93e;hpb=7eba2f98240cd9a9c0cc81b4ebb7103bbe8630a7;p=gnulib.git

diff --git a/tests/test-rmdir.c b/tests/test-rmdir.c
index 9d8eb5ab0..8a24a688a 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-2013 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,24 +30,18 @@
 #include <stdlib.h>
 #include <sys/stat.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-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);
 }