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 278f4b45d2866f6877d29ec14d576a331340fc90..29169172b57f4c9ba4b6c5955dd4be7cc068925b 100644 (file)
--- 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 eb2e8a853522b111aca6fab4cd2618585892d57d..79eec1cb993c78d0128de186dfbed2df57ba0e19 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*"] } {