summaryrefslogtreecommitdiff
path: root/modules/fchownat-tests
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-04-30 23:14:19 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-04-30 23:14:41 -0700
commit5191133e01659a051c21ea16765d9233b6a9fe47 (patch)
treef8532c7c7a50a47ac7a34e32c3578521afb08dd9 /modules/fchownat-tests
parent4bbfd284981dbc46d8a8c2116242aa7d5694b6af (diff)
downloadgnulib-5191133e01659a051c21ea16765d9233b6a9fe47.tar.gz
utimensat-tests, etc.: try to fix some races
Problem reported by Bernhard Voelker in <http://lists.gnu.org/archive/html/bug-gnulib/2013-04/msg00071.html>. I don't know whether this patch fixes that race condition, but it fixes *some* race conditions, so it should be a win. * modules/chown-tests (Depends-on): * modules/fchownat-tests (Depends-on): * modules/fdutimensat-tests (Depends-on): * modules/futimens-tests (Depends-on): * modules/lchown-tests (Depends-on): * modules/stat-time-tests (Depends-on): * modules/utimens-tests (Depends-on): * modules/utimensat-tests (Depends-on): Depend on nanosleep, not usleep. * modules/chown-tests (test_chown_LDADD): * modules/lchown-tests (test_lchown_LDADD): * modules/stat-time-tests (test_stat_time_LDADD): New macro. * modules/fchownat-tests (test_fchownat_LDADD): * modules/fdutimensat-tests (test_fdutimensat_LDADD): * modules/futimens-tests (test_futimens_LDADD): * modules/utimens-tests (test_utimens_LDADD): * modules/utimensat-tests (test_utimensat_LDADD): Add $(LIB_NANOSLEEP). * modules/stat-time-tests (Files): Add tests/nap.h. * tests/nap.h: Include <limits.h>, for INT_MAX. (lt_mtime): Remove. (diff_timespec): New function. (get_stat): Rename from get_mtime. All callers changed. (nap_works): Determine the needed delay by inspecting the file system's timestamp jumps; this should be more reliable. Look at both mtime and ctime, and take the maximum of the two jumps. (nap_works, guess_delay): Return a nanosecond cound, not a microsecond count. All callers changed. (nap_works, nap): Use nanosleep, not usleep. Check for nanosleep failure. (nap): Multiply the guess by 1.125, to accommodate the case where the file system's clock is a bit slower than nanosleep's clock. * tests/test-stat-time.c (BASE): New macro. Include nap.h. (nap): Remove; nap.h now defines this. This removes a duplicate implementation of 'nap'.
Diffstat (limited to 'modules/fchownat-tests')
-rw-r--r--modules/fchownat-tests4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/fchownat-tests b/modules/fchownat-tests
index 1b79d47f55..7b9991e6c6 100644
--- a/modules/fchownat-tests
+++ b/modules/fchownat-tests
@@ -9,9 +9,9 @@ tests/macros.h
Depends-on:
ignore-value
mgetgroups
+nanosleep
openat-h
progname
-usleep
stat-time
symlink
@@ -21,4 +21,4 @@ AC_CHECK_FUNCS_ONCE([getegid])
Makefile.am:
TESTS += test-fchownat
check_PROGRAMS += test-fchownat
-test_fchownat_LDADD = $(LDADD) @LIBINTL@
+test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@