From 1dfaba679f59c9cf2c20a8cc0326b4bc294b0c09 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Wed, 16 Feb 2011 23:27:28 +0000 Subject: [PATCH] quotearg test: Avoid test failure on mingw. * tests/test-quotearg.sh: Convert the locale identifier from native Windows syntax to Unix syntax. (cherry picked from commit 4baa767de84048d693cb07d6d8a461b3343f1bb7) --- ChangeLog | 6 ++++++ tests/test-quotearg.sh | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index f3bbc8c35..291fd8d0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-02-12 Bruno Haible + + quotearg test: Avoid test failure on mingw. + * tests/test-quotearg.sh: Convert the locale identifier from native + Windows syntax to Unix syntax. + 2011-02-12 Paul Eggert stdlib: support non-GCC __attribute__ diff --git a/tests/test-quotearg.sh b/tests/test-quotearg.sh index e050d0788..4dd718880 100755 --- a/tests/test-quotearg.sh +++ b/tests/test-quotearg.sh @@ -12,5 +12,15 @@ else fi fi +# Work around a limitation of gettext() on native Windows in gettext 0.18.1: +# the locale identifiers in the environment variables LC_ALL etc. have to +# be in Unix conventions, not in native Window conventions. +if test $locale = French_France.65001; then + locale=fr_FR.UTF-8 +fi +if test $locale = French_France.1252; then + locale=fr_FR.CP1252 +fi + LOCALE=$locale LOCALEDIR="$srcdir/locale" \ ./test-quotearg${EXEEXT} -- 2.11.0