[commits] r8632 - in /branches/eglibc-2_10/libc: ChangeLog.eglibc libio/Makefile libio/tst-fgetwc.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Jul  2 13:03:14 2009
New Revision: 8632

Log:
	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>.

Modified:
    branches/eglibc-2_10/libc/ChangeLog.eglibc
    branches/eglibc-2_10/libc/libio/Makefile
    branches/eglibc-2_10/libc/libio/tst-fgetwc.c

Modified: branches/eglibc-2_10/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_10/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_10/libc/ChangeLog.eglibc Thu Jul  2 13:03:14 2009
@@ -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

Modified: branches/eglibc-2_10/libc/libio/Makefile
==============================================================================
--- branches/eglibc-2_10/libc/libio/Makefile (original)
+++ branches/eglibc-2_10/libc/libio/Makefile Thu Jul  2 13:03:14 2009
@@ -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
 

Modified: branches/eglibc-2_10/libc/libio/tst-fgetwc.c
==============================================================================
--- branches/eglibc-2_10/libc/libio/tst-fgetwc.c (original)
+++ branches/eglibc-2_10/libc/libio/tst-fgetwc.c Thu Jul  2 13:03:14 2009
@@ -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;