# HG changeset patch # User Bruno Haible # Date 1297564901 -3600 # Node ID 80ac14ef4e0bb3c2646d622bf90a37fb2ca33150 # Parent 79ce823766c36e0a77aa7ed9ac5f16de5937a7a8 quotearg test: Avoid test failure on mingw. * tests/test-quotearg.sh: Convert the locale identifier from native Windows syntax to Unix syntax. diff -r 79ce823766c3 -r 80ac14ef4e0b ChangeLog --- a/ChangeLog Sun Feb 13 03:39:33 2011 +0100 +++ b/ChangeLog Sun Feb 13 03:41:41 2011 +0100 @@ -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 Bruno Haible setlocale: Prefer gnulib's override over libintl's override. diff -r 79ce823766c3 -r 80ac14ef4e0b tests/test-quotearg.sh --- a/tests/test-quotearg.sh Sun Feb 13 03:39:33 2011 +0100 +++ b/tests/test-quotearg.sh Sun Feb 13 03:41:41 2011 +0100 @@ -12,5 +12,15 @@ 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}