[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patches] Set environment for two iconvdata tests
- To: patches@xxxxxxxxxx
- Subject: [patches] Set environment for two iconvdata tests
- From: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>
- Date: Thu, 15 May 2008 00:16:07 +0000 (UTC)
Two iconvdata tests use setlocale and so need LOCPATH set so they can find
the newly built locales; one uses a locale not in the list of those being
built for testing, so that needs adding to the list. I've applied this
patch to trunk and 2.8 branch to fix these issues; it should fix the
failures of those tests seen in the results on the test-results list.
Index: localedata/Makefile
===================================================================
--- localedata/Makefile (revision 6169)
+++ localedata/Makefile (working copy)
@@ -145,7 +145,7 @@
# eglibc: 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 \
Index: iconvdata/Makefile
===================================================================
--- iconvdata/Makefile (revision 6169)
+++ iconvdata/Makefile (working copy)
@@ -75,6 +75,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: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc (revision 6169)
+++ ChangeLog.eglibc (working copy)
@@ -1,3 +1,8 @@
+2008-05-14 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.
+ * localedata/Makefile (LOCALES): Add en_US.UTF-8.
+
2008-05-14 Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
Generate zoneinfo when cross-building EGLIBC.
--
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx