mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'

Browse Source 
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@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2018-02-08 16:56:54 +01:00 committed by Junio C Hamano
parent 93b4b0313c
commit 0f59128f7b
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
t/test-lib-functions.sh
View File

@ -705,6 +705,32 @@ test_cmp_bin() {
cmp "$@" 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 # Call any command "$@" but be more verbose about its
# failure. This is handy for commands like "test" which do # failure. This is handy for commands like "test" which do
# not output anything when they fail. # not output anything when they fail.

26
t/test-lib.sh
View File

@ -1062,32 +1062,6 @@ else
test_set_prereq C_LOCALE_OUTPUT test_set_prereq C_LOCALE_OUTPUT
fi 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_lazy_prereq PIPE '
# test whether the filesystem supports FIFOs # test whether the filesystem supports FIFOs
test_have_prereq !MINGW,!CYGWIN && test_have_prereq !MINGW,!CYGWIN &&