Fix tests under GETTEXT_POISON on git-apply

Use the i18n-specific test functions in test scripts for git-apply.
This issue was was introduced in the following commits:

de373 i18n: apply: mark parseopt strings for translation
3638e i18n: apply: mark strings for translation

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/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index ec4deea1923919a88c6f1f9d35e11cb7737e323d..1215ae544b6915fe2cc6df4d193c8f3a805beba1 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -63,7 +63,7 @@ test_expect_success 'apply --numstat understands diff --binary format' '
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.

-test_expect_success 'apply detecting corrupt patch correctly' '
+test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '

        git diff >output &&
        sed -e "s/-CIT/xCIT/" <output >broken &&
        test_must_fail git apply --stat --summary broken 2>detected &&
        git diff >output &&
        sed -e "s/-CIT/xCIT/" <output >broken &&
        test_must_fail git apply --stat --summary broken 2>detected &&


@@ -73,7 +73,7 @@ test_expect_success 'apply detecting corrupt patch correctly' '
        test "$detected" = xCIT
 '
 
        test "$detected" = xCIT
 '
 

-test_expect_success 'apply detecting corrupt patch correctly' '
+test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '

        git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
        test_must_fail git apply --stat --summary broken 2>detected &&
        detected=`cat detected` &&
        git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
        test_must_fail git apply --stat --summary broken 2>detected &&
        detected=`cat detected` &&

diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
index a33d510bf6b27a6bb2c640cfc9d11f462cbdf7a6..c5fecdfed43dc5682307dd0fdb66ddd78dece056 100755 (executable)
--- a/t/t4120-apply-popt.sh
+++ b/t/t4120-apply-popt.sh
@@ -32,7 +32,7 @@ test_expect_success 'apply git diff with -p2' '
 test_expect_success 'apply with too large -p' '
        cp file1.saved file1 &&
        test_must_fail git apply --stat -p3 patch.file 2>err &&
 test_expect_success 'apply with too large -p' '
        cp file1.saved file1 &&
        test_must_fail git apply --stat -p3 patch.file 2>err &&

-       grep "removing 3 leading" err
+       test_i18ngrep "removing 3 leading" err

 '
 
 test_expect_success 'apply (-p2) traditional diff with funny filenames' '
 '
 
 test_expect_success 'apply (-p2) traditional diff with funny filenames' '


@@ -54,7 +54,7 @@ test_expect_success 'apply (-p2) traditional diff with funny filenames' '
 test_expect_success 'apply with too large -p and fancy filename' '
        cp file1.saved file1 &&
        test_must_fail git apply --stat -p3 patch.escaped 2>err &&
 test_expect_success 'apply with too large -p and fancy filename' '
        cp file1.saved file1 &&
        test_must_fail git apply --stat -p3 patch.escaped 2>err &&

-       grep "removing 3 leading" err
+       test_i18ngrep "removing 3 leading" err

 '
 
 test_expect_success 'apply (-p2) diff, mode change only' '
 '
 
 test_expect_success 'apply (-p2) diff, mode change only' '

diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh
index 94da99075c55c790aae7a260ff6c4964f950c47c..2ecb4216b7179ef836836d90a5f76f5e4349ca23 100755 (executable)
--- a/t/t4133-apply-filenames.sh
+++ b/t/t4133-apply-filenames.sh
@@ -30,9 +30,9 @@ EOF
 
 test_expect_success 'apply diff with inconsistent filenames in headers' '
        test_must_fail git apply bad1.patch 2>err &&
 
 test_expect_success 'apply diff with inconsistent filenames in headers' '
        test_must_fail git apply bad1.patch 2>err &&

-       grep "inconsistent new filename" err &&
+       test_i18ngrep "inconsistent new filename" err &&

        test_must_fail git apply bad2.patch 2>err &&
        test_must_fail git apply bad2.patch 2>err &&

-       grep "inconsistent old filename" err
+       test_i18ngrep "inconsistent old filename" err

 '
 
 test_done
 '
 
 test_done