Jeff King wrote:
> Yes, but this wasn't gettext-ed at all until 2012-02-02, and then it
> didn't get merged into master until the week after. How often do you
> run GETTEXT_POISON tests? I know I don't, and obviously Junio does not
> include them as part of his process before pushing out master.
The theory is that it should be convenient to run them when we are
considering a "gettextize" patch.
Maybe something like the following would make it easier for some
people to always build with GETTEXT_POISON and run tests with
GIT_GETTEXT_POISON only occasionally. I'd rather have a real poison
locale since this would not require any runtime support in the git
binary, though. Does the value of LC_MESSAGES have to be a valid
locale? Would something like en_US@poison work?
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
t/test-lib.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git i/t/test-lib.sh w/t/test-lib.sh
index b7d7100c..83f7362a 100644
--- i/t/test-lib.sh
+++ w/t/test-lib.sh
@@ -51,6 +51,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $(perl -e '
my $ok = join("|", qw(
TRACE
DEBUG
+ GETTEXT_POISON
USE_LOOKUP
TEST
.*_TEST
@@ -621,10 +622,8 @@ test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
# Can we rely on git's output in the C locale?
-if test -n "$GETTEXT_POISON"
+if test -n "$GIT_GETTEXT_POISON"
then
- GIT_GETTEXT_POISON=YesPlease
- export GIT_GETTEXT_POISON
test_set_prereq GETTEXT_POISON
else
test_set_prereq C_LOCALE_OUTPUT
@@ -635,7 +634,7 @@ fi
# under GETTEXT_POISON this pretends that the command produced expected
# results.
test_i18ncmp () {
- test -n "$GETTEXT_POISON" || test_cmp "$@"
+ test -n "$GIT_GETTEXT_POISON" || test_cmp "$@"
}
# Use this instead of "grep expected-string actual" to see if the
@@ -644,7 +643,7 @@ test_i18ncmp () {
# under GETTEXT_POISON this pretends that the command produced expected
# results.
test_i18ngrep () {
- if test -n "$GETTEXT_POISON"
+ if test -n "$GIT_GETTEXT_POISON"
then
: # pretend success
elif test "x!" = "x$1"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html