From: Ian Beckwith <ianb@erislabs.net>
Date: Wed, 16 Feb 2011 23:27:28 +0000 (+0000)
Subject: quotearg test: Avoid test failure on mingw.
X-Git-Tag: stable/20110216~22
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1dfaba679f59c9cf2c20a8cc0326b4bc294b0c09;p=gnulib.git

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)
---

diff --git a/ChangeLog b/ChangeLog
index f3bbc8c35..291fd8d0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-12  Bruno Haible  <bruno@clisp.org>
+
+	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  <eggert@cs.ucla.edu>
 
 	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}