This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Set LOCPATH for two iconv tests
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: libc-alpha at sourceware dot org
- Date: Thu, 15 May 2008 00:23:14 +0000 (UTC)
- Subject: Set LOCPATH for two iconv tests
The tests bug-iconv6 and tst-iconv7 use setlocale, so they need to
have LOCPATH set when run so the newly built locale information is
found. bug-iconv6 uses the en_US.UTF-8 locale, which isn't in the
list in localedata/Makefile of locales built for testing, so that
needs adding there as well. This patch adds the required -ENV
settings and adds en_US.UTF-8 to the LOCALES list.
2008-05-14 Joseph Myers <joseph@codesourcery.com>
* iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.
* localedata/Makefile (LOCALES): Add en_US.UTF-8.
Index: iconvdata/Makefile
===================================================================
RCS file: /cvs/glibc/libc/iconvdata/Makefile,v
retrieving revision 1.156
diff -u -r1.156 Makefile
--- iconvdata/Makefile 9 Jan 2008 20:03:36 -0000 1.156
+++ iconvdata/Makefile 15 May 2008 00:17:05 -0000
@@ -72,6 +72,9 @@
tests += bug-iconv3
endif
+bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata
+tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata
+
test-srcs := tst-table-from tst-table-to
endif
Index: localedata/Makefile
===================================================================
RCS file: /cvs/glibc/libc/localedata/Makefile,v
retrieving revision 1.108
diff -u -r1.108 Makefile
--- localedata/Makefile 30 Mar 2008 23:40:06 -0000 1.108
+++ localedata/Makefile 15 May 2008 00:17:05 -0000
@@ -130,7 +130,7 @@
ifeq (no,$(cross-compiling))
# We have to generate locales
LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
- en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \
+ en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \
tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 \
--
Joseph S. Myers
joseph@codesourcery.com