On Windows, make sure not to leave empty directories

when tests are success.

SVN-Revision: 1761

diff --git a/cpio/test/main.c b/cpio/test/main.c
index c37c0746e78dffcfdea0a513112dbacb8ffbfd64..f40f38db0fa86c69a109149bed2d94bef5b7ecee 100644 (file)
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -1707,7 +1707,19 @@ test_run(int i, const char *tmpdir)
        if (tests[i].failures == 0) {
                if (!keep_temp_files && assertChdir(tmpdir)) {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-                       systemf("rmdir /S /Q %s", tests[i].name);
+                       /* Make sure not to leave empty directories.
+                        * Sometimes a processing of closing files used by tests
+                        * is not done, then rmdir will be failed and it will
+                        * leave a empty test directory. So we should wait a few
+                        * seconds and retry rmdir. */
+                       int r, t;
+                       for (t = 0; t < 10; t++) {
+                               if (t > 0)
+                                       Sleep(1000);
+                               r = systemf("rmdir /S /Q %s", tests[i].name);
+                               if (r == 0)
+                                       break;
+                       }
                        systemf("del %s", logfilename);
 #else
                        systemf("rm -rf %s", tests[i].name);

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index b35cc23498a22a266fc12570fde887782978ecb3..0c4e2f7749d0927a7b8d8f15870e4283facfc961 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -1703,7 +1703,19 @@ test_run(int i, const char *tmpdir)
        if (tests[i].failures == 0) {
                if (!keep_temp_files && assertChdir(tmpdir)) {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-                       systemf("rmdir /S /Q %s", tests[i].name);
+                       /* Make sure not to leave empty directories.
+                        * Sometimes a processing of closing files used by tests
+                        * is not done, then rmdir will be failed and it will
+                        * leave a empty test directory. So we should wait a few
+                        * seconds and retry rmdir. */
+                       int r, t;
+                       for (t = 0; t < 10; t++) {
+                               if (t > 0)
+                                       Sleep(1000);
+                               r = systemf("rmdir /S /Q %s", tests[i].name);
+                               if (r == 0)
+                                       break;
+                       }
                        systemf("del %s", logfilename);
 #else
                        systemf("rm -rf %s", tests[i].name);

diff --git a/tar/test/main.c b/tar/test/main.c
index 19391eb97eb4c5b8febfe744ee1e64bd09417e6b..cbf453c56b44de4d78e73358bb5802be7d235857 100644 (file)
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -1708,7 +1708,19 @@ test_run(int i, const char *tmpdir)
        if (tests[i].failures == 0) {
                if (!keep_temp_files && assertChdir(tmpdir)) {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-                       systemf("rmdir /S /Q %s", tests[i].name);
+                       /* Make sure not to leave empty directories.
+                        * Sometimes a processing of closing files used by tests
+                        * is not done, then rmdir will be failed and it will
+                        * leave a empty test directory. So we should wait a few
+                        * seconds and retry rmdir. */
+                       int r, t;
+                       for (t = 0; t < 10; t++) {
+                               if (t > 0)
+                                       Sleep(1000);
+                               r = systemf("rmdir /S /Q %s", tests[i].name);
+                               if (r == 0)
+                                       break;
+                       }
                        systemf("del %s", logfilename);
 #else
                        systemf("rm -rf %s", tests[i].name);