Skip to content

Commit

Permalink
Fix tests under GETTEXT_POISON on diffstat
Browse files Browse the repository at this point in the history
Use the i18n-specific test functions in test scripts for diffstat.
This issue was was introduced in v1.7.9-1-g7f814:

    7f814 Use correct grammar in diffstat summary line

and been broken under GETTEXT_POISON=YesPlease since.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jiang Xin authored and Junio C Hamano committed Aug 27, 2012
1 parent 2878568 commit b354f11
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions t/t4006-diff-mode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,24 @@ test_expect_success '--stat output after text chmod' '
test_chmod -x rezrov &&
echo " 0 files changed" >expect &&
git diff HEAD --stat >actual &&
test_cmp expect actual
test_i18ncmp expect actual
'

test_expect_success '--shortstat output after text chmod' '
git diff HEAD --shortstat >actual &&
test_cmp expect actual
test_i18ncmp expect actual
'

test_expect_success '--stat output after binary chmod' '
test_chmod +x binbin &&
echo " 0 files changed" >expect &&
git diff HEAD --stat >actual &&
test_cmp expect actual
test_i18ncmp expect actual
'

test_expect_success '--shortstat output after binary chmod' '
git diff HEAD --shortstat >actual &&
test_cmp expect actual
test_i18ncmp expect actual
'

test_done
2 changes: 1 addition & 1 deletion t/t4202-log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ sanitize_output () {
test_expect_success 'log --graph with diff and stats' '
git log --graph --pretty=short --stat -p >actual &&
sanitize_output >actual.sanitized <actual &&
test_cmp expect actual.sanitized
test_i18ncmp expect actual.sanitized
'

test_done
4 changes: 2 additions & 2 deletions t/t4205-log-pretty-formats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ test_expect_success 'NUL separation with --stat' '
stat1_part=$(git diff --stat --root HEAD^) &&
printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected &&
git log -z --stat --pretty="format:%s" >actual &&
test_cmp expected actual
test_i18ncmp expected actual
'

test_expect_failure 'NUL termination with --stat' '
stat0_part=$(git diff --stat HEAD^ HEAD) &&
stat1_part=$(git diff --stat --root HEAD^) &&
printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n\0" >expected &&
git log -z --stat --pretty="tformat:%s" >actual &&
test_cmp expected actual
test_i18ncmp expected actual
'

test_done
2 changes: 1 addition & 1 deletion t/t7508-status.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ test_expect_success 'status --column' '
# dir1/untracked dir2/untracked untracked
# dir2/modified output
EOF
test_cmp expect output
test_i18ncmp expect output
'

cat >expect <<\EOF
Expand Down

0 comments on commit b354f11

Please sign in to comment.