aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-30 12:22:05 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-30 12:22:05 -0700
commit4b705f4052432906f0acbb22b25254eb3917e36c (patch)
tree496e5b374a6cd95969a20eddc4cb8cd071e69c0c
parente0390119b249252a633875e4327c8a6463e4b6cb (diff)
downloadgit-4b705f4052432906f0acbb22b25254eb3917e36c.tar.gz
git-4b705f4052432906f0acbb22b25254eb3917e36c.tar.xz
t8001: check the exit status of the command being tested
Avoid running the command being tested as an upstream of a pipe; doing so will lose its exit status. While at it, modernise the style of the script. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t8001-annotate.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index 45cb60ea4..41962f04a 100755
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -6,10 +6,11 @@ test_description='git annotate'
PROG='git annotate'
. "$TEST_DIRECTORY"/annotate-tests.sh
-test_expect_success \
- 'Annotating an old revision works' \
- '[ $(git annotate file master | awk "{print \$3}" | grep -c "^A$") -eq 2 ] && \
- [ $(git annotate file master | awk "{print \$3}" | grep -c "^B$") -eq 2 ]'
-
+test_expect_success 'Annotating an old revision works' '
+ git annotate file master >result &&
+ awk "{ print \$3; }" <result >authors &&
+ test 2 = $(grep A <authors | wc -l) &&
+ test 2 = $(grep B <authors | wc -l)
+'
test_done