From 3bde94be9dcb81f078ca8dae5b043852174899e9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Dec 2010 17:17:36 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ tests/test-rename.h | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98acbca42..84c1e7ca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-12-25 Bruno Haible + 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 + 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 475ded06a..922458562 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 -- 2.11.0