i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507

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

diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 4ef7d09115678ff97717a5f6a3027a87490dac79..6b7c118e4fcbf3855318b2e9e3b721d07950fd25 100755 (executable)
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -72,10 +72,10 @@ cat >expect <<'EOF'
   branch-two
   master
 EOF
   branch-two
   master
 EOF

-test_expect_success C_LOCALE_OUTPUT 'git branch shows detached HEAD properly' '
+test_expect_success 'git branch shows detached HEAD properly' '

        git checkout HEAD^0 &&
        git branch >actual &&
        git checkout HEAD^0 &&
        git branch >actual &&

-       test_cmp expect actual
+       test_i18ncmp expect actual

 '
 
 test_done
 '
 
 test_done

diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 753a6c972cda61d2da3d2ecf7bd9c231004d6ad0..595d2ff990ad3305f47977431c0b7d102ca3866b 100755 (executable)
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -91,12 +91,12 @@ test_expect_success 'cherry-pick on stat-dirty working tree' '
        )
 '
 
        )
 '
 

-test_expect_success C_LOCALE_OUTPUT 'revert forbidden on dirty working tree' '
+test_expect_success 'revert forbidden on dirty working tree' '

 
        echo content >extra_file &&
        git add extra_file &&
        test_must_fail git revert HEAD 2>errors &&
 
        echo content >extra_file &&
        git add extra_file &&
        test_must_fail git revert HEAD 2>errors &&

-       grep "Your local changes would be overwritten by " errors
+       test_i18ngrep "Your local changes would be overwritten by " errors

 
 '
 
 
 '
 

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index c0c8330c20e80f26d51b62c8999533c5692094de..212ec54aaf0d805bbdecd93f3311d248a57d5b08 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
        test "$head" = "$newhead"
 '
 
        test "$head" = "$newhead"
 '
 

-test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
+test_expect_success 'advice from failed cherry-pick' "

        pristine_detach initial &&
 
        picked=\$(git rev-parse --short picked) &&
        pristine_detach initial &&
 
        picked=\$(git rev-parse --short picked) &&


@@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
        EOF
        test_must_fail git cherry-pick picked 2>actual &&
 
        EOF
        test_must_fail git cherry-pick picked 2>actual &&
 

-       test_cmp expected actual
+       test_i18ncmp expected actual

 "
 
 test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
 "
 
 test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '