tests: don't require debug system() to pass

When running a cross-compilation to mingw on a Linux host,
but without a valid mingw rm executable, the debug-only
system() call would fail.  This is not fatal to the test,
since the call is merely a debugging aid if a prior call to
the test encountered a failure and left garbage; in general,
the tests should pass and the system() call have nothing to
clean in the first place.  Also, the system() call only
needs to happen once at startup, not once per iteration
into the tests performed by .h files.

* tests/test-lstat.h (test_lstat_func): Move debug cleanup...
* tests/test-rmdir.h (test_rmdir_func): Likewise.
* tests/test-unlink.h (test_unlink_func): Likewise.
* tests/test-fstatat.c (main): ...into callers.
* tests/test-lstat.c (main): Likewise.
* tests/test-rmdir.c (main): Likewise.
* tests/test-unlink.c (main): Likewise.
* tests/test-unlinkat.c (main): Likewise.
* tests/test-areadlink-with-size.c (main): Don't require a
debug-only system call to pass, aiding cross-testing to mingw.
* tests/test-areadlink.c (main): Likewise.
* tests/test-areadlinkat-with-size.c (main): Likewise.
* tests/test-areadlinkat.c (main): Likewise.
* tests/test-canonicalize-lgpl.c (main): Likewise.
* tests/test-canonicalize.c (main): Likewise.
* tests/test-chown.c (main): Likewise.
* tests/test-fchownat.c (main): Likewise.
* tests/test-lchown.c (main): Likewise.
* tests/test-fdutimensat.c (main): Likewise.
* tests/test-futimens.c (main): Likewise.
* tests/test-link.c (main): Likewise.
* tests/test-linkat.c (main): Likewise.
* tests/test-mkdir.c (main): Likewise.
* tests/test-mkdirat.c (main): Likewise.
* tests/test-mkfifo.c (main): Likewise.
* tests/test-mkfifoat.c (main): Likewise.
* tests/test-mknod.c (main): Likewise.
* tests/test-readlink.c (main): Likewise.
* tests/test-remove.c (main): Likewise.
* tests/test-rename.c (main): Likewise.
* tests/test-renameat.c (main): Likewise.
* tests/test-symlink.c (main): Likewise.
* tests/test-symlinkat.c (main): Likewise.
* tests/test-utimens.c (main): Likewise.
* tests/test-utimensat.c (main): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 60a9b5626f91e7b332c564c334489593aa61d2fc..41ef6f718bacffcb665069df4b051cf219b789e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2009-12-29  Simon Josefsson  <simon@josefsson.org>
+       and Eric Blake  <ebb9@byu.net>
+
+       tests: don't require debug system() to pass
+       * tests/test-lstat.h (test_lstat_func): Move debug cleanup...
+       * tests/test-rmdir.h (test_rmdir_func): Likewise.
+       * tests/test-unlink.h (test_unlink_func): Likewise.
+       * tests/test-fstatat.c (main): ...into callers.
+       * tests/test-lstat.c (main): Likewise.
+       * tests/test-rmdir.c (main): Likewise.
+       * tests/test-unlink.c (main): Likewise.
+       * tests/test-unlinkat.c (main): Likewise.
+       * tests/test-areadlink-with-size.c (main): Don't require a
+       debug-only system call to pass, aiding cross-testing to mingw.
+       * tests/test-areadlink.c (main): Likewise.
+       * tests/test-areadlinkat-with-size.c (main): Likewise.
+       * tests/test-areadlinkat.c (main): Likewise.
+       * tests/test-canonicalize-lgpl.c (main): Likewise.
+       * tests/test-canonicalize.c (main): Likewise.
+       * tests/test-chown.c (main): Likewise.
+       * tests/test-fchownat.c (main): Likewise.
+       * tests/test-lchown.c (main): Likewise.
+       * tests/test-fdutimensat.c (main): Likewise.
+       * tests/test-futimens.c (main): Likewise.
+       * tests/test-link.c (main): Likewise.
+       * tests/test-linkat.c (main): Likewise.
+       * tests/test-mkdir.c (main): Likewise.
+       * tests/test-mkdirat.c (main): Likewise.
+       * tests/test-mkfifo.c (main): Likewise.
+       * tests/test-mkfifoat.c (main): Likewise.
+       * tests/test-mknod.c (main): Likewise.
+       * tests/test-readlink.c (main): Likewise.
+       * tests/test-remove.c (main): Likewise.
+       * tests/test-rename.c (main): Likewise.
+       * tests/test-renameat.c (main): Likewise.
+       * tests/test-symlink.c (main): Likewise.
+       * tests/test-symlinkat.c (main): Likewise.
+       * tests/test-utimens.c (main): Likewise.
+       * tests/test-utimensat.c (main): Likewise.
+
 2009-12-29  Simon Josefsson  <simon@josefsson.org>
 
        * modules/selinux-h (selinux/selinux.h, selinux/context.h): Depend

diff --git a/tests/test-areadlink-with-size.c b/tests/test-areadlink-with-size.c
index 8b7ff63ec558f0f2c71056b3310119be7d341479..d5f4a0d3eb83117dca91bf7a0c44f716a5bbe233 100644 (file)
--- a/tests/test-areadlink-with-size.c
+++ b/tests/test-areadlink-with-size.c
@@ -39,7 +39,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_areadlink (areadlink_with_size, true);
 }

diff --git a/tests/test-areadlink.c b/tests/test-areadlink.c
index 2e8aaa5fb746902d1c9c31fdf979c44319bb76b8..272a614cba33098e547ce92c7f71aa04dc936826 100644 (file)
--- a/tests/test-areadlink.c
+++ b/tests/test-areadlink.c
@@ -46,7 +46,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_areadlink (do_areadlink, true);
 }

diff --git a/tests/test-areadlinkat-with-size.c b/tests/test-areadlinkat-with-size.c
index 67252a7fc01c735e4f792eb93117e0731a425939..113c6b40e96b7dd39a0760cf4d33c4a811feab4e 100644 (file)
--- a/tests/test-areadlinkat-with-size.c
+++ b/tests/test-areadlinkat-with-size.c
@@ -50,7 +50,7 @@ main (void)
   int result;
 
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Basic tests.  */
   result = test_areadlink (do_areadlinkat_with_size, false);

diff --git a/tests/test-areadlinkat.c b/tests/test-areadlinkat.c
index 54e0745c785bf439b9e5cef3b30b565497d0005e..68d7f583b8a64bd5ad516190c019d96658cda246 100644 (file)
--- a/tests/test-areadlinkat.c
+++ b/tests/test-areadlinkat.c
@@ -50,7 +50,7 @@ main (void)
   int result;
 
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Basic tests.  */
   result = test_areadlink (do_areadlinkat, false);

diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index e35d921bbdf43fd461d67ecf701fc6122b040709..2425921587a081b0ff7330aa96ee523aaca40bbb 100644 (file)
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -55,7 +55,7 @@ main (void)
      any leftovers from a previous partial run.  */
   {
     int fd;
-    ASSERT (system ("rm -rf " BASE " ise") == 0);
+    system ("rm -rf " BASE " ise");
     ASSERT (mkdir (BASE, 0700) == 0);
     fd = creat (BASE "/tra", 0600);
     ASSERT (0 <= fd);

diff --git a/tests/test-canonicalize.c b/tests/test-canonicalize.c
index 583026744f5dca248a19d1b64cdd8f9fc8617cd7..b09c1caed2800a453eafcaf79a92b01b244d4ff1 100644 (file)
--- a/tests/test-canonicalize.c
+++ b/tests/test-canonicalize.c
@@ -46,7 +46,7 @@ main (void)
      any leftovers from a previous partial run.  */
   {
     int fd;
-    ASSERT (system ("rm -rf " BASE " ise") == 0);
+    system ("rm -rf " BASE " ise");
     ASSERT (mkdir (BASE, 0700) == 0);
     fd = creat (BASE "/tra", 0600);
     ASSERT (0 <= fd);

diff --git a/tests/test-chown.c b/tests/test-chown.c
index 39749039ed84f0626b35a4e82cc1365b3ad55907..15a6d75357a3f7f629b3d6eabb6cdcf15d3d8833 100644 (file)
--- a/tests/test-chown.c
+++ b/tests/test-chown.c
@@ -42,7 +42,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_chown (chown, true);
 }

diff --git a/tests/test-fchownat.c b/tests/test-fchownat.c
index a6d177d36a3fbd0c7f556288f8b84e6713b73ae9..f7c5827ae66bd299103204bb4a6a7feedaefb8b9 100644 (file)
--- a/tests/test-fchownat.c
+++ b/tests/test-fchownat.c
@@ -63,7 +63,7 @@ main (void)
   int result2; /* Skip because of no lchown support.  */
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Basic tests.  */
   result1 = test_chown (do_chown, true);

diff --git a/tests/test-fdutimensat.c b/tests/test-fdutimensat.c
index ad0eca94b8c9cb2af3676ecf205f8973cbd52ff2..0e7666117ab53e2696297aeaac14f10c5f3728dc 100644 (file)
--- a/tests/test-fdutimensat.c
+++ b/tests/test-fdutimensat.c
@@ -84,7 +84,7 @@ main (void)
   int fd;
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Basic tests.  */
   result1 = test_utimens (do_utimens, true);

diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index e6abe38e26dd35834f1580af7e1836bef0b446e8..6160e16145cbdbd0a8020e05f93b47e57f577122 100644 (file)
--- a/tests/test-fstatat.c
+++ b/tests/test-fstatat.c
@@ -60,6 +60,10 @@ int
 main (void)
 {
   int result;
+
+  /* Remove any leftovers from a previous partial run.  */
+  system ("rm -rf " BASE "*");
+
   result = test_stat_func (do_stat, false);
   ASSERT (test_lstat_func (do_lstat, false) == result);
   dfd = open (".", O_RDONLY);

diff --git a/tests/test-futimens.c b/tests/test-futimens.c
index 0ee1fe05edeba4649d9ef5185a602e3c9ce2365c..af553a9bcdf33005bbd799d58d90bc327b8dcdd0 100644 (file)
--- a/tests/test-futimens.c
+++ b/tests/test-futimens.c
@@ -44,7 +44,7 @@ int
 main (void)
 {
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_futimens (futimens, true);
 }

diff --git a/tests/test-lchown.c b/tests/test-lchown.c
index 24b7ece95ad3a44656ba54f861f06281433d54de..0c0aa117798c66b662568c5c626b512297e8d902 100644 (file)
--- a/tests/test-lchown.c
+++ b/tests/test-lchown.c
@@ -42,7 +42,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_lchown (lchown, true);
 }

diff --git a/tests/test-link.c b/tests/test-link.c
index 817c464b7a8837bf2a3b477554a1223df078ddc2..9c1ce3621036c4092ee56e9e18a1b6fe5d951452 100644 (file)
--- a/tests/test-link.c
+++ b/tests/test-link.c
@@ -40,7 +40,7 @@ int
 main (void)
 {
   /* Remove any garbage left from previous partial runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_link (link, true);
 }

diff --git a/tests/test-linkat.c b/tests/test-linkat.c
index 98165c01530af18383a2d4516a140ce405b9fa64..efe5109db1ec4878e00e359dbca231060f3be0e7 100644 (file)
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -81,7 +81,7 @@ main (void)
   int result;
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Test basic link functionality, without mentioning symlinks.  */
   result = test_link (do_link, true);

diff --git a/tests/test-lstat.c b/tests/test-lstat.c
index 1940a2158bae3a8a19261da4dede649d8af554ac..bff40ebf302f72e2ea7d4199a09787d0f88c917a 100644 (file)
--- a/tests/test-lstat.c
+++ b/tests/test-lstat.c
@@ -52,5 +52,8 @@ do_lstat (char const *name, struct stat *st)
 int
 main (void)
 {
+  /* Remove any leftovers from a previous partial run.  */
+  system ("rm -rf " BASE "*");
+
   return test_lstat_func (do_lstat, true);
 }

diff --git a/tests/test-lstat.h b/tests/test-lstat.h
index 3828316f6d182044e6de4b23c5ec8983be8caf58..071626a3c7d82b342738da72afbb9a2332ee19a0 100644 (file)
--- a/tests/test-lstat.h
+++ b/tests/test-lstat.h
@@ -28,9 +28,6 @@ test_lstat_func (int (*func) (char const *, struct stat *), bool print)
   struct stat st1;
   struct stat st2;
 
-  /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
-
   /* Test for common directories.  */
   ASSERT (func (".", &st1) == 0);
   ASSERT (func ("./", &st2) == 0);

diff --git a/tests/test-mkdir.c b/tests/test-mkdir.c
index 379e90c5a35156cd758cac780ed5c85edc26c42d..6be4486e81f80a9cf02507a2b836f46137adf010 100644 (file)
--- a/tests/test-mkdir.c
+++ b/tests/test-mkdir.c
@@ -40,7 +40,7 @@ int
 main (void)
 {
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_mkdir (mkdir, true);
 }

diff --git a/tests/test-mkdirat.c b/tests/test-mkdirat.c
index d3180e6d5630a18c8a53106b990e682b881ea6cf..fe0da254fac73f23b0e99400df9b92e5c9548582 100644 (file)
--- a/tests/test-mkdirat.c
+++ b/tests/test-mkdirat.c
@@ -51,7 +51,7 @@ main (void)
   int result;
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Test basic mkdir functionality.  */
   result = test_mkdir (do_mkdir, false);

diff --git a/tests/test-mkfifo.c b/tests/test-mkfifo.c
index 4b4c93b53df0f6166c2b4e4efadfba678d141db8..fc36412b1ee25f473dea32275ececb6c1c93c91a 100644 (file)
--- a/tests/test-mkfifo.c
+++ b/tests/test-mkfifo.c
@@ -40,7 +40,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_mkfifo (mkfifo, true);
 }

diff --git a/tests/test-mkfifoat.c b/tests/test-mkfifoat.c
index ef3e817c8dfb5d2b0e664cff961bdf06a176a4b1..0b2018173d0226d17bdd0c0405aee55216a1b3a2 100644 (file)
--- a/tests/test-mkfifoat.c
+++ b/tests/test-mkfifoat.c
@@ -72,7 +72,7 @@ main (void)
   int result;
 
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Basic tests.  */
   result = test_mkfifo (do_mkfifoat, true);

diff --git a/tests/test-mknod.c b/tests/test-mknod.c
index a62df6d112393938e43cf03ace5b7b100b51cbb1..ed16b5002887cdace054a1bcb357a17a05774330 100644 (file)
--- a/tests/test-mknod.c
+++ b/tests/test-mknod.c
@@ -47,7 +47,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* We can only portably test creation of fifos.  Anything else
      requires root privileges and knowledge of device numbers.  */

diff --git a/tests/test-readlink.c b/tests/test-readlink.c
index 4ec0fcdf73a0be58b4571da1cc32ec6cfc1bbbe1..ed30c1d8cb61692dd9a2eacd77aceadd8ce9d7a1 100644 (file)
--- a/tests/test-readlink.c
+++ b/tests/test-readlink.c
@@ -41,7 +41,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_readlink (readlink, true);
 }

diff --git a/tests/test-remove.c b/tests/test-remove.c
index 4bcc2ec2dd4567191eecb95a9eec53a86ebcb696..5428e3723d0be35743e96c38214dd66d2fa6bcd5 100644 (file)
--- a/tests/test-remove.c
+++ b/tests/test-remove.c
@@ -38,7 +38,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Setup.  */
   ASSERT (mkdir (BASE "dir", 0700) == 0);

diff --git a/tests/test-rename.c b/tests/test-rename.c
index 797cc940dfead6f6774b08a0139d5c29590860b1..17cd025cf89620216d65ee91c5133731d5271f45 100644 (file)
--- a/tests/test-rename.c
+++ b/tests/test-rename.c
@@ -39,7 +39,7 @@ int
 main (void)
 {
   /* Remove any garbage left from previous partial runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_rename (rename, true);
 }

diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index de84fa6764c61de0eda7abecc40fb7b29bdc771a..a22af0451380a36b1b0b8edbf829df52367cc141 100644 (file)
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -57,7 +57,7 @@ main (void)
   int result;
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Test basic rename functionality, using current directory.  */
   result = test_rename (do_rename, false);

diff --git a/tests/test-rmdir.c b/tests/test-rmdir.c
index 9ca88e2abd54630d63eac91a6756919d86d9c170..a270ca7e3a9a4bfb82e02a317c79781917d923a5 100644 (file)
--- a/tests/test-rmdir.c
+++ b/tests/test-rmdir.c
@@ -39,5 +39,8 @@ SIGNATURE_CHECK (rmdir, int, (char const *));
 int
 main (void)
 {
+  /* Remove any leftovers from a previous partial run.  */
+  system ("rm -rf " BASE "*");
+
   return test_rmdir_func (rmdir, true);
 }

diff --git a/tests/test-rmdir.h b/tests/test-rmdir.h
index 5f1e955bea03bb1cc589d715bacba41140f71465..19c69616d1ce64d2b2afd1fdab8b53f99ade9b93 100644 (file)
--- a/tests/test-rmdir.h
+++ b/tests/test-rmdir.h
@@ -25,9 +25,6 @@
 static int
 test_rmdir_func (int (*func) (char const *name), bool print)
 {
-  /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
-
   /* Setup.  */
   ASSERT (mkdir (BASE "dir", 0700) == 0);
   ASSERT (close (creat (BASE "dir/file", 0600)) == 0);

diff --git a/tests/test-symlink.c b/tests/test-symlink.c
index c84b2bc7f19416724c6c7022ac4f8db6b6259912..f066ee3dc331a8a670e841a666e1145cf2229769 100644 (file)
--- a/tests/test-symlink.c
+++ b/tests/test-symlink.c
@@ -40,7 +40,7 @@ int
 main (void)
 {
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   return test_symlink (symlink, true);
 }

diff --git a/tests/test-symlinkat.c b/tests/test-symlinkat.c
index 714dd989322393c0555c56ffd7b76c2e0bcf2e94..be59d5de78f26c9b6438c0933db2f11d874d12b5 100644 (file)
--- a/tests/test-symlinkat.c
+++ b/tests/test-symlinkat.c
@@ -64,7 +64,7 @@ main (void)
   int result;
 
   /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Perform same checks as counterpart functions.  */
   result = test_readlink (do_readlink, false);

diff --git a/tests/test-unlink.c b/tests/test-unlink.c
index 15258028a5f0c52e136aa0e12628bba03eb8863b..b87f7d642bd7136a3b00432f031f554985f19483 100644 (file)
--- a/tests/test-unlink.c
+++ b/tests/test-unlink.c
@@ -41,5 +41,8 @@ SIGNATURE_CHECK (unlink, int, (char const *));
 int
 main (void)
 {
+  /* Remove any leftovers from a previous partial run.  */
+  system ("rm -rf " BASE "*");
+
   return test_unlink_func (unlink, true);
 }

diff --git a/tests/test-unlink.h b/tests/test-unlink.h
index e65057de4747a268144677634c978aa76e253007..05be29cf12b546970033ebe0ea2d59b5e76c82de 100644 (file)
--- a/tests/test-unlink.h
+++ b/tests/test-unlink.h
@@ -25,9 +25,6 @@
 static int
 test_unlink_func (int (*func) (char const *name), bool print)
 {
-  /* Remove any leftovers from a previous partial run.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
-
   /* Setup.  */
   ASSERT (mkdir (BASE "dir", 0700) == 0);
   ASSERT (close (creat (BASE "dir/file", 0600)) == 0);

diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index 3d7f1184108a5ed326dbcc526de99c33c593ff9f..bd2b48a0d88ae53c446c277ef61379c633557f18 100644 (file)
--- a/tests/test-unlinkat.c
+++ b/tests/test-unlinkat.c
@@ -60,6 +60,10 @@ main (void)
   /* FIXME: Add tests of fd other than ".".  */
   int result1;
   int result2;
+
+  /* Remove any leftovers from a previous partial run.  */
+  system ("rm -rf " BASE "*");
+
   result1 = test_rmdir_func (rmdirat, false);
   result2 = test_unlink_func (unlinker, false);
   ASSERT (result1 == result2);

diff --git a/tests/test-utimens.c b/tests/test-utimens.c
index 618d941b0a047edf69eb0d9c107cf58db3833842..dccaacc5e3c6f781f77f914d28b6c3de5c7afdb9 100644 (file)
--- a/tests/test-utimens.c
+++ b/tests/test-utimens.c
@@ -66,7 +66,7 @@ main (void)
   int result3; /* Skip because of no lutimens support.  */
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   result1 = test_utimens (utimens, true);
   ASSERT (test_utimens (do_fdutimens, false) == result1);

diff --git a/tests/test-utimensat.c b/tests/test-utimensat.c
index ba4c22d6ed72b98bbbe15c6b14d911c1e473ed84..45aa8c373ce4a47110c5f21f85d7df1ee04219ca 100644 (file)
--- a/tests/test-utimensat.c
+++ b/tests/test-utimensat.c
@@ -66,7 +66,7 @@ main (void)
   int fd;
 
   /* Clean up any trash from prior testsuite runs.  */
-  ASSERT (system ("rm -rf " BASE "*") == 0);
+  system ("rm -rf " BASE "*");
 
   /* Basic tests.  */
   result1 = test_utimens (do_utimensat, true);