i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 0492877d516b8f33a8fd1555ec77a2aa3b34352c..d924056c8a16f6029f1f3227ef806f0def326bdd 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -135,8 +135,8 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
        grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
 '
 
        grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
 '
 

-test_expect_success C_LOCALE_OUTPUT 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
-       grep "To prevent you from losing history, non-fast-forward updates were rejected" \
+test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
+       test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \

                output
 '
 
                output
 '
 

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 6c3719141aa567b97de1228f53a6c49eaf139e8e..a9b0ac1efc0eac3f50bd9fe26e5900307eddaba2 100755 (executable)
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -42,13 +42,13 @@ b3 behind 1
 b4 ahead 2
 EOF
 
 b4 ahead 2
 EOF
 

-test_expect_success C_LOCALE_OUTPUT 'branch -v' '
+test_expect_success 'branch -v' '

        (
                cd test &&
                git branch -v
        ) |
        sed -n -e "$script" >actual &&
        (
                cd test &&
                git branch -v
        ) |
        sed -n -e "$script" >actual &&

-       test_cmp expect actual
+       test_i18ncmp expect actual

 '
 
 test_expect_success 'checkout' '
 '
 
 test_expect_success 'checkout' '

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 18269962458248034598d2bb15315f0d2a121027..f67aa6ff6a3c2af2d0c1999e8203da3a922b0555 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -123,8 +123,8 @@ cat - >err.expect <<EOF
 warning: tag 'A' is really 'Q' here
 EOF
 check_describe A-* HEAD
 warning: tag 'A' is really 'Q' here
 EOF
 check_describe A-* HEAD

-test_expect_success C_LOCALE_OUTPUT 'warning was displayed for Q' '
-       test_cmp err.expect err.actual
+test_expect_success 'warning was displayed for Q' '
+       test_i18ncmp err.expect err.actual

 '
 test_expect_success 'rename tag Q back to A' '
        mv .git/refs/tags/Q .git/refs/tags/A
 '
 test_expect_success 'rename tag Q back to A' '
        mv .git/refs/tags/Q .git/refs/tags/A

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 1dedfd0c836c06eb3d2f66aa8e4e7eac54368508..2ac1c66079b7656a60a25fbbb91c48c0b1db010b 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1120,13 +1120,11 @@ test_expect_success \
        ! (GIT_EDITOR=cat git tag -a initial-comment > actual)
 '
 
        ! (GIT_EDITOR=cat git tag -a initial-comment > actual)
 '
 

-test_expect_success \
-       C_LOCALE_OUTPUT \
-       'message in editor has initial comment: first line' '
+test_expect_success 'message in editor has initial comment: first line' '

        # check the first line --- should be empty
        echo >first.expect &&
        sed -e 1q <actual >first.actual &&
        # check the first line --- should be empty
        echo >first.expect &&
        sed -e 1q <actual >first.actual &&

-       test_cmp first.expect first.actual
+       test_i18ncmp first.expect first.actual

 '
 
 test_expect_success \
 '
 
 test_expect_success \

diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 14fcb1c7f5d8366827bc6e3256f118a757d2e996..cffb2696d4b1a1ca7bdc962590dc7cedde1e5e2a 100755 (executable)
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -124,16 +124,16 @@ cat >expected <<EOF
 Would remove expected
 Would remove result
 EOF
 Would remove expected
 Would remove result
 EOF

-test_expect_success C_LOCALE_OUTPUT 'git-clean, absent case' '
+test_expect_success 'git-clean, absent case' '

        setup_absent &&
        git clean -n > result &&
        setup_absent &&
        git clean -n > result &&

-       test_cmp expected result
+       test_i18ncmp expected result

 '
 
 '
 

-test_expect_success C_LOCALE_OUTPUT 'git-clean, dirty case' '
+test_expect_success 'git-clean, dirty case' '

        setup_dirty &&
        git clean -n > result &&
        setup_dirty &&
        git clean -n > result &&

-       test_cmp expected result
+       test_i18ncmp expected result

 '
 
 #TODO test_expect_failure 'git-apply adds file' false
 '
 
 #TODO test_expect_failure 'git-apply adds file' false

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index b4fcc86a10f15178da25da159e160b38d717f318..da2a1f194cf5bd055bf48bb389f478da84168914 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -38,7 +38,7 @@ cat >expect <<EOF
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 

-test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' '
+test_expect_success 'M/D conflict does not segfault' '

        mkdir mdconflict &&
        (
                cd mdconflict &&
        mkdir mdconflict &&
        (
                cd mdconflict &&


@@ -50,9 +50,9 @@ test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' '
                git commit -m delete &&
                test_must_fail git merge master &&
                test_must_fail git commit --dry-run >../actual &&
                git commit -m delete &&
                test_must_fail git merge master &&
                test_must_fail git commit --dry-run >../actual &&

-               test_cmp ../expect ../actual &&
+               test_i18ncmp ../expect ../actual &&

                git status >../actual &&
                git status >../actual &&

-               test_cmp ../expect ../actual
+               test_i18ncmp ../expect ../actual

        )
 '
 
        )
 '