[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patches] Backport tst-fgetwc patch
- To: patches@xxxxxxxxxx
- Subject: [patches] Backport tst-fgetwc patch
- From: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>
- Date: Thu, 2 Jul 2009 20:04:21 +0000 (UTC)
I've applied this patch backport to EGLIBC 2.10 branch to fix failures of
libio/tst-fgetwc.
Index: libio/tst-fgetwc.c
===================================================================
--- libio/tst-fgetwc.c (revision 8631)
+++ libio/tst-fgetwc.c (working copy)
@@ -6,7 +6,7 @@
static int
do_test (void)
{
- if (setlocale (LC_ALL, "de_DE.utf8") == NULL)
+ if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
{
puts ("setlocale failed");
return 1;
Index: libio/Makefile
===================================================================
--- libio/Makefile (revision 8631)
+++ libio/Makefile (working copy)
@@ -175,6 +175,7 @@
bug-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
tst-swscanf-ENV = LOCPATH=$(common-objpfx)localedata
bug-ftell-ENV = LOCPATH=$(common-objpfx)localedata
+tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata
generated = tst-fopenloc.mtrace tst-fopenloc.check
Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc (revision 8631)
+++ ChangeLog.eglibc (working copy)
@@ -1,3 +1,14 @@
+2009-07-02 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ Backport:
+
+ 2009-06-15 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #10196]
+ * libio/tst-fgetwc.c (do_test): Use de_DE.UTF-8 as locale name.
+ * libio/Makefile: Run tst-fgetwc with necessary envvar.
+ Patch by Bruce Dubbs <bdubbs@xxxxxxxxxxxxxxxxxxxx>.
+
2009-06-23 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* nptl/init.c (sighandler_setxid): Remove duplicate decrement of
--
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx