diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 05:04:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 05:04:02 +0300 |
| commit | a8e2394704d0543f4e1f1ac6ea532d098316d97e (patch) | |
| tree | 9120b53b6c93bb8db02997cb446a4311a7e21311 /t/test-lib-functions.sh | |
| parent | ca320b256c07157f66aad5e7d23a3b71de6952d5 (diff) | |
| parent | 6789275d3780bcb950e6be8557aeedf160d4ad6d (diff) | |
Merge branch 'jc/test-i18ngrep'
Another step to deprecate test_i18ngrep.
* jc/test-i18ngrep:
tests: teach callers of test_i18ngrep to use test_grep
test framework: further deprecate test_i18ngrep
Diffstat (limited to 't/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 56b33536ed..9c3cf12b26 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1263,14 +1263,16 @@ test_cmp_bin () { cmp "$@" } -# Wrapper for grep which used to be used for -# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other -# in-flight changes. Should not be used and will be removed soon. +# Deprecated - do not use this in new code test_i18ngrep () { + test_grep "$@" +} + +test_grep () { eval "last_arg=\${$#}" test -f "$last_arg" || - BUG "test_i18ngrep requires a file to read as the last parameter" + BUG "test_grep requires a file to read as the last parameter" if test $# -lt 2 || { test "x!" = "x$1" && test $# -lt 3 ; } |