From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 8 Jun 2015 14:42:07 +0000 (+0100)
Subject: backport: libstdc++.exp (libstdc++_init): Unset LANGUAGE environment variable.
X-Git-Tag: releases/gcc-4.9.3~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=864224b904ae9ca0ff97977d089be176c45b8996;p=thirdparty%2Fgcc.git

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

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

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

From-SVN: r224234
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 278f4b45d286..29169172b57f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2015-06-08  Jonathan Wakely  <jwakely@redhat.com>
 
+	Backported from mainline
+	2015-06-01  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/lib/libstdc++.exp (libstdc++_init): Unset LANGUAGE
+	environment variable.
+
 	PR libstdc++/66354
 	* include/bits/stl_algobase.h (__fill_a): Check length before calling
 	memset.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index eb2e8a853522..79eec1cb993c 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*"] } {