Re: [PATCH] Update tests to use test-chmtime

[Junio C Hamano <junkio@cox.net>]

Eric Wong <normalperson@yhbt.net> writes:

> -case "$(date -d @11111111 +%s 2>/dev/null)" in
> -11111111)
> ...
> -	touch -m -t "$predate1" $rr/preimage
> -	touch -m -t "$predate2" $rr2/preimage
> ...
> -esac
> +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))
> +
> +test-chmtime =$almost_60_days_ago $rr/preimage
> +test-chmtime =$almost_15_days_ago $rr2/preimage

Very nice.
I've been wanting to get rid of this part for quite a while.

However, is '+%s' output portable enough for this change to be
an improvement?

I would suggest changing "test-chmtime =-200 file" to set the
mtime of the file to 200 seconds in the past, relative to
present.

---
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index d5bb6ec..639d45f 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -112,11 +112,10 @@ rr2=.git/rr-cache/$sha2
 mkdir $rr2
 echo Hello > $rr2/preimage
 
-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))
+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
diff --git a/test-chmtime.c b/test-chmtime.c
index 69b3ba9..2a1d00d 100644
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@ -1,7 +1,7 @@
 #include "git-compat-util.h"
 #include <utime.h>
 
-static const char usage_str[] = "(+|=|-)<seconds> <file_1> [<file_2>]";
+static const char usage_str[] = "(+|=|-)<seconds> <file_1>...";
 
 int main(int argc, const char *argv[])
 {
@@ -19,6 +19,10 @@ int main(int argc, const char *argv[])
 		fprintf(stderr, "Not a base-10 integer: %s\n", argv[1] + 1);
 		goto usage;
 	}
+	if (set_eq && set_time < 0) {
+		time_t now = time(NULL);
+		set_time += now;
+	}
 
 	for (i = 2; i < argc; i++) {
 		struct stat sb;