This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Make tst-fgetwc use newly built locale data


The test libio/tst-fgetwc uses a locale and so needs tst-fgetwc-ENV
set so that the newly built locale data is used during testing.  In
addition, it seems to need to use the spelling de_DE.UTF-8 not
de_DE.utf8 for the newly built locale to be found.  This patch fixes
both issues.

2009-04-18  Joseph Myers  <joseph@codesourcery.com>

	* libio/Makefile (tst-fgetwc-ENV): Define.
	* libio/tst-fgetwc.c: Use de_DE.UTF-8 not de_DE.utf8.

Index: libio/Makefile
===================================================================
RCS file: /cvs/glibc/libc/libio/Makefile,v
retrieving revision 1.90
diff -u -r1.90 Makefile
--- libio/Makefile	4 Feb 2009 21:27:08 -0000	1.90
+++ libio/Makefile	18 Apr 2009 16:18:56 -0000
@@ -147,6 +147,7 @@
 tst-widetext-ENV = LOCPATH=$(common-objpfx)localedata LANGUAGE=C
 tst-fopenloc-ENV = LOCPATH=$(common-objpfx)localedata \
 		   MALLOC_TRACE=$(objpfx)tst-fopenloc.mtrace
+tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata
 tst-fgetws-ENV = LOCPATH=$(common-objpfx)localedata
 tst-ungetwc1-ENV = LOCPATH=$(common-objpfx)localedata
 tst-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
Index: libio/tst-fgetwc.c
===================================================================
RCS file: /cvs/glibc/libc/libio/tst-fgetwc.c,v
retrieving revision 1.1
diff -u -r1.1 tst-fgetwc.c
--- libio/tst-fgetwc.c	4 Feb 2009 21:25:31 -0000	1.1
+++ libio/tst-fgetwc.c	18 Apr 2009 16:18:56 -0000
@@ -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;

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]