From 2dba5bbc14d7bfedb089d60174520065516f658b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 24 Feb 2015 14:19:31 +0000 Subject: [PATCH] t0200: disable more tests with MSys2 that rely on locale.exe There is a MinGW gettext.exe, but still no MinGW locale.exe. Instead the MSys2 locale.exe kicks in, which corresponds to the MSys2 gettext.exe, however. Therefore some assumptions of t0200 cannot be fulfilled when running inside MSys2. Signed-off-by: Johannes Schindelin --- t/t0200-gettext-basic.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t0200-gettext-basic.sh b/t/t0200-gettext-basic.sh index 8853d8afb9..6ab50b4818 100755 --- a/t/t0200-gettext-basic.sh +++ b/t/t0200-gettext-basic.sh @@ -58,7 +58,7 @@ test_expect_success GETTEXT_LOCALE 'sanity: gettext(unknown) is passed through' ' # xgettext from C -test_expect_success GETTEXT_LOCALE 'xgettext: C extraction of _() and N_() strings' ' +test_expect_success GETTEXT_LOCALE,!MINGW 'xgettext: C extraction of _() and N_() strings' ' printf "TILRAUN: C tilraunastrengur" >expect && printf "\n" >>expect && printf "Sjá '\''git help SKIPUN'\'' til að sjá hjálp fyrir tiltekna skipun." >>expect && @@ -81,7 +81,7 @@ test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction' ' test_cmp expect actual ' -test_expect_success GETTEXT_LOCALE 'xgettext: Shell extraction with $variable' ' +test_expect_success GETTEXT_LOCALE,!MINGW 'xgettext: Shell extraction with $variable' ' printf "TILRAUN: Skeljartilraunastrengur með breytunni a var i able" >x-expect && LANGUAGE=is LC_ALL="$is_IS_locale" variable="a var i able" eval_gettext "TEST: A Shell test \$variable" >x-actual && test_cmp x-expect x-actual @@ -94,7 +94,7 @@ test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction' ' test_cmp expect actual ' -test_expect_success GETTEXT_LOCALE 'xgettext: Perl extraction with %s' ' +test_expect_success GETTEXT_LOCALE,!MINGW 'xgettext: Perl extraction with %s' ' printf "TILRAUN: Perl tilraunastrengur með breytunni %%s" >expect && LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test variable %s" >actual && test_cmp expect actual