Mercurial > hg > octave-kai > gnulib-hg
changeset 13868:a6ec6c0554b0
rename, renameat: Avoid test failures at NFS mounted locations.
* tests/test-rename.h (dentry_exists, assert_nonexistent): New
functions.
(test_rename): Use assert_nonexistent.
* tests/test-rename.c: Include <dirent.h>.
* tests/test-renameat.c: Likewise.
Reported by Gary V. Vaughan <gary@gnu.org>.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 14 Nov 2010 00:57:14 +0100 |
parents | 99f7d71ff81f |
children | 358298a833bb |
files | ChangeLog tests/test-rename.c tests/test-rename.h tests/test-renameat.c |
diffstat | 4 files changed, 55 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-11-13 Bruno Haible <bruno@clisp.org> + rename, renameat: Avoid test failures at NFS mounted locations. + * tests/test-rename.h (dentry_exists, assert_nonexistent): New + functions. + (test_rename): Use assert_nonexistent. + * tests/test-rename.c: Include <dirent.h>. + * tests/test-renameat.c: Likewise. + Reported by Gary V. Vaughan <gary@gnu.org>. + rename, renameat: Document Linux bug with NFS <http://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00154.html>. * doc/posix-functions/rename.texi: Mention the NFS bug on Linux.
--- a/tests/test-rename.c +++ b/tests/test-rename.c @@ -21,6 +21,7 @@ #include "signature.h" SIGNATURE_CHECK (rename, int, (char const *, char const *)); +#include <dirent.h> #include <errno.h> #include <fcntl.h> #include <stdbool.h>
--- a/tests/test-rename.h +++ b/tests/test-rename.h @@ -20,6 +20,49 @@ appropriate headers are already included. If PRINT, warn before skipping symlink tests with status 77. */ +/* Tests whether a file, given by a file name without slashes, exists in + the current directory, by scanning the directory entries. */ +static bool +dentry_exists (const char *filename) +{ + bool exists = false; + DIR *dir = opendir ("."); + + ASSERT (dir != NULL); + for (;;) + { + struct dirent *d = readdir (dir); + if (d == NULL) + break; + if (strcmp (d->d_name, filename) == 0) + { + exists = true; + break; + } + } + ASSERT (closedir (dir) == 0); + return exists; +} + +/* Asserts that a specific file, given by a file name without slashes, does + not exist in the current directory. */ +static void +assert_nonexistent (const char *filename) +{ + struct stat st; + + /* The usual way to test the presence of a file is via stat() or lstat(). */ + errno = 0; + 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)); +} + static int test_rename (int (*func) (char const *, char const *), bool print) { @@ -226,9 +269,7 @@ } { /* Full onto empty. */ ASSERT (func (BASE "dir", BASE "dir2") == 0); - errno = 0; - ASSERT (stat (BASE "dir", &st) == -1); - ASSERT (errno == ENOENT); + assert_nonexistent (BASE "dir"); ASSERT (stat (BASE "dir2/file", &st) == 0); /* Files present here: {BASE}file @@ -263,9 +304,7 @@ */ { ASSERT (func (BASE "dir", BASE "dir2/") == 0); - errno = 0; - ASSERT (stat (BASE "dir", &st) == -1); - ASSERT (errno == ENOENT); + assert_nonexistent (BASE "dir"); ASSERT (stat (BASE "dir2/file", &st) == 0); } /* Files present here: