SZEDER Gábor <szeder.dev@xxxxxxxxx> writes:
> Both 'test_i18ncmp' and 'test_i18ngrep' helper functions are supposed
> to be called from our test scripts, so they should be in
> 'test-lib-functions.sh'.
>
> Signed-off-by: SZEDER Gábor <szeder.dev@xxxxxxxxx>
> ---
> t/test-lib-functions.sh | 26 ++++++++++++++++++++++++++
> t/test-lib.sh | 26 --------------------------
> 2 files changed, 26 insertions(+), 26 deletions(-)
Hmph. I do not care too much either way, but I had an impression
that test-lib-functions.sh is meant to be more generic (i.e. those
who want can steal it from us and use it in their project without
dragging too much of the local convention we employ in this project)
than what is in test-lib.sh, which can heavily be specific to Git,
and I also had an impression that gettext-poison build is quite a
local convention we use in this project, not applicable to other
people.
>
> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> index 1701fe2a0..92ed02937 100644
> --- a/t/test-lib-functions.sh
> +++ b/t/test-lib-functions.sh
> @@ -705,6 +705,32 @@ test_cmp_bin() {
> cmp "$@"
> }
>
> +# Use this instead of test_cmp to compare files that contain expected and
> +# actual output from git commands that can be translated. When running
> +# under GETTEXT_POISON this pretends that the command produced expected
> +# results.
> +test_i18ncmp () {
> + test -n "$GETTEXT_POISON" || test_cmp "$@"
> +}
> +
> +# Use this instead of "grep expected-string actual" to see if the
> +# output from a git command that can be translated either contains an
> +# expected string, or does not contain an unwanted one. When running
> +# under GETTEXT_POISON this pretends that the command produced expected
> +# results.
> +test_i18ngrep () {
> + if test -n "$GETTEXT_POISON"
> + then
> + : # pretend success
> + elif test "x!" = "x$1"
> + then
> + shift
> + ! grep "$@"
> + else
> + grep "$@"
> + fi
> +}
> +
> # Call any command "$@" but be more verbose about its
> # failure. This is handy for commands like "test" which do
> # not output anything when they fail.
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 9a0a21f49..852b22c80 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -1062,32 +1062,6 @@ else
> test_set_prereq C_LOCALE_OUTPUT
> fi
>
> -# Use this instead of test_cmp to compare files that contain expected and
> -# actual output from git commands that can be translated. When running
> -# under GETTEXT_POISON this pretends that the command produced expected
> -# results.
> -test_i18ncmp () {
> - test -n "$GETTEXT_POISON" || test_cmp "$@"
> -}
> -
> -# Use this instead of "grep expected-string actual" to see if the
> -# output from a git command that can be translated either contains an
> -# expected string, or does not contain an unwanted one. When running
> -# under GETTEXT_POISON this pretends that the command produced expected
> -# results.
> -test_i18ngrep () {
> - if test -n "$GETTEXT_POISON"
> - then
> - : # pretend success
> - elif test "x!" = "x$1"
> - then
> - shift
> - ! grep "$@"
> - else
> - grep "$@"
> - fi
> -}
> -
> test_lazy_prereq PIPE '
> # test whether the filesystem supports FIFOs
> test_have_prereq !MINGW,!CYGWIN &&
