tests: teach callers of test_i18ngrep to use test_grep

[thirdparty/git.git] / t / t9800-git-p4-basic.sh

diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index a4b3cb94929c9cddfdb5a751f39b42acdb2529ab..53af8e34ac1c40a31dee6e6f4449f8c52dcf6f59 100755 (executable)
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -54,7 +54,7 @@ test_expect_success 'git p4 sync uninitialized repo' '
        (
                cd "$git" &&
                test_must_fail git p4 sync 2>errs &&
-               test_i18ngrep "Perhaps you never did" errs
+               test_grep "Perhaps you never did" errs
        )
 '
 
@@ -86,7 +86,7 @@ test_expect_success 'git p4 sync existing branch without changes' '
                test_commit head &&
                git p4 sync --branch=depot //depot@all &&
                git p4 sync --branch=refs/remotes/p4/depot >out &&
-               test_i18ngrep "No changes to import!" out
+               test_grep "No changes to import!" out
        )
 '
 
@@ -101,7 +101,7 @@ test_expect_success 'git p4 sync existing branch with relative name' '
                test_commit head &&
                git p4 sync --branch=branch1 //depot@all &&
                git p4 sync --branch=p4/branch1 >out &&
-               test_i18ngrep "No changes to import!" out
+               test_grep "No changes to import!" out
        )
 '
 
@@ -116,7 +116,7 @@ test_expect_success 'git p4 sync existing branch with nested path' '
                test_commit head &&
                git p4 sync --branch=p4/some/path //depot@all &&
                git p4 sync --branch=some/path >out &&
-               test_i18ngrep "No changes to import!" out
+               test_grep "No changes to import!" out
        )
 '
 
@@ -131,7 +131,7 @@ test_expect_success 'git p4 sync branch explicit ref without p4 in path' '
                test_commit head &&
                git p4 sync --branch=refs/remotes/someremote/depot //depot@all &&
                git p4 sync --branch=refs/remotes/someremote/depot >out &&
-               test_i18ngrep "No changes to import!" out
+               test_grep "No changes to import!" out
        )
 '
 
@@ -143,7 +143,7 @@ test_expect_success 'git p4 sync nonexistent ref' '
                test_commit head &&
                git p4 sync --branch=depot //depot@all &&
                test_must_fail git p4 sync --branch=depot2 2>errs &&
-               test_i18ngrep "Perhaps you never did" errs
+               test_grep "Perhaps you never did" errs
        )
 '
 
@@ -155,7 +155,7 @@ test_expect_success 'git p4 sync existing non-p4-imported ref' '
                test_commit head &&
                git p4 sync --branch=depot //depot@all &&
                test_must_fail git p4 sync --branch=refs/heads/master 2>errs &&
-               test_i18ngrep "Perhaps you never did" errs
+               test_grep "Perhaps you never did" errs
        )
 '
 
@@ -290,7 +290,7 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
                export PATH &&
                test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
        ) &&
-       test_i18ngrep ! Traceback errs
+       test_grep ! Traceback errs
 '
 
 # Hide a file from p4d, make sure we catch its complaint.  This won't fail in
@@ -301,7 +301,7 @@ test_expect_success 'exit gracefully for p4 server errors' '
        mv "$db"/depot/file1,v "$db"/depot/file1,v,hidden &&
        test_when_finished cleanup_git &&
        test_expect_code 1 git p4 clone --dest="$git" //depot@1 >out 2>err &&
-       test_i18ngrep "Error from p4 print" err
+       test_grep "Error from p4 print" err
 '
 
 test_expect_success 'clone --bare should make a bare repository' '