tests: teach callers of test_i18ngrep to use test_grep
They are equivalents and the former still exists, so as long as the only change this commit makes are to rewrite test_i18ngrep to test_grep, there won't be any new bug, even if there still are callers of test_i18ngrep remaining in the tree, or when merged to other topics that add new uses of test_i18ngrep. This patch was produced more or less with git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' | xargs perl -p -i -e 's/test_i18ngrep /test_grep /' and a good way to sanity check the result yourself is to run the above in a checkout of c4603c1c (test framework: further deprecate test_i18ngrep, 2023-10-31) and compare the resulting working tree contents with the result of applying this patch to the same commit. You'll see that test_i18ngrep in a few t/lib-*.sh files corrected, in addition to the manual reproduction. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -263,7 +263,7 @@ test_expect_success 'required filter with absent clean field' '
|
||||
|
||||
echo test >test.ac &&
|
||||
test_must_fail git add test.ac 2>stderr &&
|
||||
test_i18ngrep "fatal: test.ac: clean filter .absentclean. failed" stderr
|
||||
test_grep "fatal: test.ac: clean filter .absentclean. failed" stderr
|
||||
'
|
||||
|
||||
test_expect_success 'required filter with absent smudge field' '
|
||||
@ -276,7 +276,7 @@ test_expect_success 'required filter with absent smudge field' '
|
||||
git add test.as &&
|
||||
rm -f test.as &&
|
||||
test_must_fail git checkout -- test.as 2>stderr &&
|
||||
test_i18ngrep "fatal: test.as: smudge filter absentsmudge failed" stderr
|
||||
test_grep "fatal: test.as: smudge filter absentsmudge failed" stderr
|
||||
'
|
||||
|
||||
test_expect_success 'filtering large input to small output should use little memory' '
|
||||
@ -733,7 +733,7 @@ test_expect_success 'process filter should restart after unexpected write failur
|
||||
git checkout --quiet --no-progress . 2>git-stderr.log &&
|
||||
|
||||
grep "smudge write error" git-stderr.log &&
|
||||
test_i18ngrep "error: external filter" git-stderr.log &&
|
||||
test_grep "error: external filter" git-stderr.log &&
|
||||
|
||||
cat >expected.log <<-EOF &&
|
||||
START
|
||||
|
Reference in New Issue
Block a user