aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-20 13:17:59 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-21 19:33:22 -0800
commit5df9140c92349a807952628a04ee94b65c5bead5 (patch)
tree9937a2658c3d766025daf0e5a58ac1d5e3089999 /t
parent63be37b06fa873348c3de0becea201796bc88610 (diff)
downloadgit-5df9140c92349a807952628a04ee94b65c5bead5.tar.gz
git-5df9140c92349a807952628a04ee94b65c5bead5.tar.xz
t4011: "sleep 1" is not enough on FAT
This test depended on "sleep 1" to be enough to dirty the index entry for a symlink. Alex noticed that on his Cygwin installation "sleep 1" was sometimes not enough, and after further discussion with Christopher Faylor, it was brought up that on FAT filesystem timestamp granularity is 2 seconds so sleeping 1 second is not enough. For now this patch takes an easy workaround of sleeping for 3 seconds. Very strictly speaking, POSIX requires lstat to fill only S_IFMT part of st_mode and st_size for symlinks, and depending on timestamp might be considered a bug, but we depend on that anyway, so it is better to test that. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t4011-diff-symlink.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index e3ebf382e..379a831f0 100755
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -58,7 +58,7 @@ EOF
test_expect_success \
'diff identical, but newly created symlink' \
- 'sleep 1 &&
+ 'sleep 3 &&
ln -s xyzzy frotz &&
git-diff-index -M -p $tree > current &&
compare_diff_patch current expected'