git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>
Subject: [PATCH] Update tests to use test-chmtime
Date: Sat, 24 Feb 2007 16:59:52 -0800	[thread overview]
Message-ID: <11723651934078-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: <11723651923476-git-send-email-normalperson@yhbt.net>

t4200-rerere:
  Removed non-portable date dependency and avoid touch
  Avoid "test -a" which isn't portable, either

lib-git-svn:
  Use test-chmtime instead of Perl one-liner to poke

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 t/lib-git-svn.sh  |    2 +-
 t/t4200-rerere.sh |   54 ++++++++++++++++++++--------------------------------
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 27ad3b7..f6fe78c 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -46,5 +46,5 @@ rawsvnrepo="$svnrepo"
 svnrepo="file://$svnrepo"
 
 poke() {
-	perl -e '@x = stat($ARGV[0]); utime($x[8], $x[9] + 1, $ARGV[0])' "$1"
+	test-chmtime +1 "$1"
 }
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index c571a1b..d5bb6ec 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -112,39 +112,27 @@ rr2=.git/rr-cache/$sha2
 mkdir $rr2
 echo Hello > $rr2/preimage
 
-case "$(date -d @11111111 +%s 2>/dev/null)" in
-11111111)
-	# 'date' must be able to take arbitrary input with @11111111 notation.
-	# for this test to succeed.  We should fix this part using more
-	# portable script someday.
-
-	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" +%Y%m%d%H%M.%S)"
-	predate2="$(date -d "@$almost_15_days_ago" +%Y%m%d%H%M.%S)"
-	postdate1="$(date -d "@$just_over_60_days_ago" +%Y%m%d%H%M.%S)"
-	postdate2="$(date -d "@$just_over_15_days_ago" +%Y%m%d%H%M.%S)"
-
-	touch -m -t "$predate1" $rr/preimage
-	touch -m -t "$predate2" $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"
-
-	touch -m -t "$postdate1" $rr/preimage
-	touch -m -t "$postdate2" $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"
-	;;
-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
+
+test_expect_success 'garbage collection (part1)' 'git rerere gc'
+
+test_expect_success 'young records still live' \
+	"test -f $rr/preimage && test -f $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 && test ! -f $rr2/preimage"
 
 test_done
 
-- 
1.5.0.137.ge6502

  reply	other threads:[~2007-02-25  1:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-25  0:59 [PATCH] Add test-chmtime: a utility to change mtime on files Eric Wong
2007-02-25  0:59 ` Eric Wong [this message]
2007-02-25  7:09   ` [PATCH] Update tests to use test-chmtime Junio C Hamano
2007-02-25 15:20     ` Johannes Schindelin
2007-02-25 19:23     ` Eric Wong
2007-02-25 19:33       ` Junio C Hamano
2007-02-25  1:27 ` [PATCH] Add test-chmtime: a utility to change mtime on files Johannes Schindelin
2007-02-25  2:15   ` Eric Wong
2007-02-25  2:18 ` [PATCH (try 2)] " Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11723651934078-git-send-email-normalperson@yhbt.net \
    --to=normalperson@yhbt.net \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).