From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 17 Jun 2015 13:15:22 +0000 (+0000)
Subject: backport: libstdc++.exp (libstdc++_init): Unset LANGUAGE environment variable.
X-Git-Tag: releases/gcc-4.8.5~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f5f498e588adb5a397f87eb89c7cb404320c87;p=thirdparty%2Fgcc.git

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 dc60f8b2180e..20a53eb281e6 100644
--- 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 51ff6dd87413..e6b983e3a153 100644
--- 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*"] } {