summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Sago <ogham@bsago.me>2020-10-17 21:25:49 +0100
committerBenjamin Sago <ogham@bsago.me>2020-10-17 21:25:49 +0100
commitef7bb43dbb9a6a6a7a02bc43283d6a2df5848d60 (patch)
tree552b50bbb6e1df20e84d0331b036ca93a8f29a0c
parent61c5df7c111fc7451bf6b8f0dfdcb2b6b46577d0 (diff)
Fix xtests bug where git3 file date kept changing
-rwxr-xr-xdevtools/dev-create-test-filesystem.sh4
-rw-r--r--xtests/outputs/git3_long.ansitxt2
2 files changed, 2 insertions, 4 deletions
diff --git a/devtools/dev-create-test-filesystem.sh b/devtools/dev-create-test-filesystem.sh
index d42e714..3541a39 100755
--- a/devtools/dev-create-test-filesystem.sh
+++ b/devtools/dev-create-test-filesystem.sh
@@ -323,9 +323,7 @@ git init >/dev/null
ln -s aaa/aaa/a b
# This normally fails with:
-# touch: cannot touch '/testcases/git3/b': No such file or directory
-# but that’s expected (the file deliberately does not exist)
-find "$TEST_ROOT/git3" -exec touch {} -t $FIXED_DATE \; 2>/dev/null
+find "$TEST_ROOT/git3" -exec touch {} -h -t $FIXED_DATE \;
sudo chown $FIXED_USER:$FIXED_USER -R "$TEST_ROOT/git3"
diff --git a/xtests/outputs/git3_long.ansitxt b/xtests/outputs/git3_long.ansitxt
index 03cd30d..908b7da 100644
--- a/xtests/outputs/git3_long.ansitxt
+++ b/xtests/outputs/git3_long.ansitxt
@@ -1 +1 @@
-lrwxrwxrwx 9 cassowary 17 Oct 14:27 -N b -> aaa/aaa/a
+lrwxrwxrwx 9 cassowary  1 Jan 12:34 -N b -> aaa/aaa/a