summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/test-rename.h15
2 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 98acbca425..84c1e7ca1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-12-25 Bruno Haible <bruno@clisp.org>
+ rename, renameat: Avoid test failures at NFS mounted locations.
+ * tests/test-rename.h (assert_nonexistent): Remove the old directory,
+ so that subsequent mkdir calls succeed.
+
+2010-12-25 Bruno Haible <bruno@clisp.org>
+
iswblank: Fix C++ link error on Solaris 8.
* lib/wctype.in.h (iswblank): Declare using _GL_FUNCDECL_RPL or
_GL_FUNCDECL_SYS.
diff --git a/tests/test-rename.h b/tests/test-rename.h
index 475ded06aa..922458562e 100644
--- a/tests/test-rename.h
+++ b/tests/test-rename.h
@@ -56,11 +56,16 @@ assert_nonexistent (const char *filename)
if (stat (filename, &st) == -1)
ASSERT (errno == ENOENT);
else
- /* But after renaming a directory over an empty directory on an NFS-mounted
- file system, on Linux 2.6.18, for a period of 30 seconds the old
- directory name is "present" according to stat() but "nonexistent"
- according to dentry_exists(). */
- ASSERT (!dentry_exists (filename));
+ {
+ /* But after renaming a directory over an empty directory on an NFS-
+ mounted file system, on Linux 2.6.18, for a period of 30 seconds the
+ old directory name is "present" according to stat() but "nonexistent"
+ according to dentry_exists(). */
+ ASSERT (!dentry_exists (filename));
+ /* Remove the old directory name, so that subsequent mkdir calls
+ succeed. */
+ (void) rmdir (filename);
+ }
}
static int