X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4200-rerere.sh;h=639d45fcec2ce80a225da4d73696cea5af3a9de3;hb=8807d321af394ffb2180d085669337bcd5018c50;hp=5ee5b23095d4316c942ee80643d277dd48adf7c9;hpb=ad8e72cba8e8dee8fccf11d98f197a44b5e3c10a;p=git.git

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 5ee5b2309..639d45fce 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -112,42 +112,26 @@ rr2=.git/rr-cache/$sha2
 mkdir $rr2
 echo Hello > $rr2/preimage
 
-case "$(date -d @11111111 +%s 2>/dev/null)" in
-[1-9]*)
-	# it is a recent GNU date. good.
-	now=$(date +%s)
-	almost_15_days_ago=$(($now+60-15*86400))
-	just_over_15_days_ago=$(($now-1-15*86400))
-	almost_60_days_ago=$(($now+60-60*86400))
-	just_over_60_days_ago=$(($now-1-60*86400))
-	predate1="$(date -d "@$almost_60_days_ago" +%c)"
-	predate2="$(date -d "@$almost_15_days_ago" +%c)"
-	postdate1="$(date -d "@$just_over_60_days_ago" +%c)"
-	postdate2="$(date -d "@$just_over_15_days_ago" +%c)"
-	;;
-*)
-	# it is not GNU date. oh, well.
-	predate1="$(date)"
-	predate2="$(date)"
-	postdate1='1 Oct 2006 00:00:00'
-	postdate2='1 Dec 2006 00:00:00'
-esac
-
-touch -m -d "$predate1" $rr/preimage
-touch -m -d "$predate2" $rr2/preimage
+almost_15_days_ago=$((60-15*86400))
+just_over_15_days_ago=$((-1-15*86400))
+almost_60_days_ago=$((60-60*86400))
+just_over_60_days_ago=$((-1-60*86400))
+
+test-chmtime =$almost_60_days_ago $rr/preimage
+test-chmtime =$almost_15_days_ago $rr2/preimage
 
 test_expect_success 'garbage collection (part1)' 'git rerere gc'
 
 test_expect_success 'young records still live' \
-	"test -f $rr/preimage -a -f $rr2/preimage"
+	"test -f $rr/preimage && test -f $rr2/preimage"
 
-touch -m -d "$postdate1" $rr/preimage
-touch -m -d "$postdate2" $rr2/preimage
+test-chmtime =$just_over_60_days_ago $rr/preimage
+test-chmtime =$just_over_15_days_ago $rr2/preimage
 
 test_expect_success 'garbage collection (part2)' 'git rerere gc'
 
 test_expect_success 'old records rest in peace' \
-	"test ! -f $rr/preimage -a ! -f $rr2/preimage"
+	"test ! -f $rr/preimage && test ! -f $rr2/preimage"
 
 test_done