backport: libstdc++.exp (libstdc++_init): Unset LANGUAGE environment variable.

2015-06-17  Matthias Klose  <doko@ubuntu.com>

        Backported from mainline
        2015-06-01  Jonathan Wakely  <jwakely@redhat.com>

        * testsuite/lib/libstdc++.exp (libstdc++_init): Unset LANGUAGE
        environment variable.

From-SVN: r224555

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dc60f8b2180e07d260185693a52373fe580a27e7..20a53eb281e6c21a591ec55e3c9156a9c272885b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-17  Matthias Klose  <doko@ubuntu.com>
+
+       Backported from mainline
+       2015-06-01  Jonathan Wakely  <jwakely@redhat.com>
+
+       * testsuite/lib/libstdc++.exp (libstdc++_init): Unset LANGUAGE
+       environment variable.
+
 2015-06-04  Renlin Li  <renlin.li@arm.com>
 
        Backported from mainline

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 51ff6dd8741315b64f7062e7fb0e1781dad7c31c..e6b983e3a153ea38fc6b1bc0704927f86bf42957 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -99,6 +99,10 @@ proc libstdc++_init { testfile } {
     setenv LC_ALL C
     setenv LANG C
 
+    # LANGUAGE changes the behavior of GNU gettext(3) and causes
+    # std::messages tests to fail.
+    array unset env LANGUAGE
+
     # Many hosts now default to a non-ASCII C locale, however, so
     # they can set a charset encoding here if they need.
     if { [ishost "*-*-cygwin*"] } {