Fix tests under GETTEXT_POISON on diffstat

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>

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 7a3e1f9a24e4be3759c29acc632fc461ede2b74b..3d4b1ba23f9eacec4e1bcd29345cc7d3943badce 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -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

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 71be59d446f773c4b567f00c469ac26225d11cb8..31869dc0dbcb5f79e4e0f5e307a4d8f617aadbe4 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -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

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 4afd77815f6bf698d4b865bad2300706d2a8e0fc..2c45de7aeaf2872873685ce9d055a7579161d875 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -88,7 +88,7 @@ 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' '
@@ -96,7 +96,7 @@ test_expect_failure 'NUL termination with --stat' '
        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

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index c206f4777a36a28687def873bd9fe60ed322fbbc..e313ef196ed91a6ad12c70b147e2309af8fb4bfd 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -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