Change the gettext tests (all of whom use lib-gettext.sh) to skip under GETTEXT_POISON=YesPlease. We also print a message to this effect. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- t/lib-gettext.sh | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh index 4570ead..c9a079e 100644 --- a/t/lib-gettext.sh +++ b/t/lib-gettext.sh @@ -11,7 +11,7 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH . "$GIT_BUILD_DIR"/git-sh-i18n -if test_have_prereq GETTEXT +if test_have_prereq GETTEXT && test_have_prereq NO_GETTEXT_POISON then # is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian is_IS_locale=$(locale -a | sed -n '/^is_IS\.[uU][tT][fF]-*8$/{ @@ -58,5 +58,11 @@ then else # Only run some tests when we don't have gettext support test_set_prereq NO_GETTEXT - say "# lib-gettext: No GETTEXT support available" + + if test_have_prereq NO_GETTEXT_POISON + then + say "# lib-gettext: GETTEXT_POISON defined, can't test gettext" + else + say "# lib-gettext: No GETTEXT support available" + fi fi -- 1.7.2.3.313.gcd15 -- 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