i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811

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

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 87d5d788cb1884fdfe218ec30582f5d3da8b5d7d..e84e822219a45cca3478f50a05756be359b43393 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -495,10 +495,10 @@ test_expect_success 'merge fast-forward in a dirty tree' '
 
 test_debug 'git log --graph --decorate --oneline --all'
 
 
 test_debug 'git log --graph --decorate --oneline --all'
 

-test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
+test_expect_success 'in-index merge' '

        git reset --hard c0 &&
        git merge --no-ff -s resolve c1 >out &&
        git reset --hard c0 &&
        git merge --no-ff -s resolve c1 >out &&

-       grep "Wonderful." out &&
+       test_i18ngrep "Wonderful." out &&

        verify_parents $c0 $c1
 '
 
        verify_parents $c0 $c1
 '
 

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index ef84f04102ed067768c66ea9608b98d47851eb8b..72a8731d5e28d71577d0c53fc25a5ddc1d2ad6de 100755 (executable)
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -150,11 +150,8 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
        git rm -fr . &&
        git checkout --orphan new &&
        cp important c0.c &&
        git rm -fr . &&
        git checkout --orphan new &&
        cp important c0.c &&

-       test_must_fail git merge c0 2>out
-'
-
-test_expect_success C_LOCALE_OUTPUT 'will not overwrite untracked file on unborn branch: output' '
-       test_cmp out expect
+       test_must_fail git merge c0 2>out &&
+       test_i18ncmp out expect

 '
 
 test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
 '
 
 test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '

diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh
index cdb3f444cd4a5970df6f375382f5cea82ccaee06..7b4798e8e4791c78e94da1354ef7279fa456983d 100755 (executable)
--- a/t/t7611-merge-abort.sh
+++ b/t/t7611-merge-abort.sh
@@ -46,11 +46,8 @@ test_expect_success 'setup' '
 pre_merge_head="$(git rev-parse HEAD)"
 
 test_expect_success 'fails without MERGE_HEAD (unstarted merge)' '
 pre_merge_head="$(git rev-parse HEAD)"
 
 test_expect_success 'fails without MERGE_HEAD (unstarted merge)' '

-       test_must_fail git merge --abort 2>output
-'
-
-test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (unstarted merge): fatal output' '
-       grep -q MERGE_HEAD output
+       test_must_fail git merge --abort 2>output &&
+       test_i18ngrep MERGE_HEAD output

 '
 
 test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' '
 '
 
 test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' '


@@ -63,11 +60,8 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' '
        test ! -f .git/MERGE_HEAD &&
        # Merge successfully completed
        post_merge_head="$(git rev-parse HEAD)" &&
        test ! -f .git/MERGE_HEAD &&
        # Merge successfully completed
        post_merge_head="$(git rev-parse HEAD)" &&

-       test_must_fail git merge --abort 2>output
-'
-
-test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (completed merge): output' '
-       grep -q MERGE_HEAD output
+       test_must_fail git merge --abort 2>output &&
+       test_i18ngrep MERGE_HEAD output

 '
 
 test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' '
 '
 
 test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' '

diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index aedf484feeb9da05054f18ab2f4913865048fe35..a8957782cfb8fae4b7c171d4c9db24ce6cd5505e 100755 (executable)
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -61,9 +61,9 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
        test_cmp empty out
 '
 
        test_cmp empty out
 '
 

-test_expect_success C_LOCALE_OUTPUT 'git grep -O --cached' '
+test_expect_success 'git grep -O --cached' '

        test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
        test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&

-       grep open-files-in-pager msg
+       test_i18ngrep open-files-in-pager msg

 '
 
 test_expect_success 'git grep -O --no-index' '
 '
 
 test_expect_success 'git grep -O --no-index' '