From: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Date: Sat, 29 Jul 2006 16:20:41 +0000 (+0100)
Subject: Fix annotate test script; notice when git-annotate fails.
X-Git-Tag: v1.4.2-rc3~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1fd4da643cb829618bbe76ab37df7f1b4dafc656;p=git.git

Fix annotate test script; notice when git-annotate fails.

The t8001-annotate.sh test claimed all tests pass, when in fact
the git-annotate perl script failed to run! (prior to fixing the
script to work with perl 5.5).

Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index b6a2edd88..8baf2fef6 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -4,7 +4,8 @@
 check_count () {
 	head=
 	case "$1" in -h) head="$2"; shift; shift ;; esac
-	$PROG file $head | perl -e '
+	$PROG file $head >.result || return 1
+	cat .result | perl -e '
 		my %expect = (@ARGV);
 		my %count = ();
 		while (<STDIN>) {