* iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.

* iconvdata/bug-iconv6.c (do_test): Use de_DE.UTF-8 locale.
git-mirror · May 15, 2008 · a754f01 · a754f01
1 parent 5deca9b
commit a754f01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
+2008-05-14  Joseph Myers  <joseph@codesourcery.com>
+
+	* iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.
+
 2008-05-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconvdata/bug-iconv6.c (do_test): Use de_DE.UTF-8 locale.
+
 	[BZ #6461]
 	* iconv/gconv_simple.c (BODY for __gconv_transform_ascii_internal):
 	Add missing braces.

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
@@ -73,6 +73,9 @@ tests += bug-iconv3
 endif
 
 test-srcs := tst-table-from tst-table-to
+
+bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata
+tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata
 endif
 
 # No code here is in libc.so.

diff --git a/iconvdata/bug-iconv6.c b/iconvdata/bug-iconv6.c
@@ -13,7 +13,7 @@ static const char testbuf[] = {
 static int
 do_test (void)
 {
-  setlocale (LC_ALL, "en_US.UTF-8");
+  setlocale (LC_ALL, "de_DE.UTF-8");
   iconv_t ic = iconv_open ("ISO-2022-JP//TRANSLIT", "UTF-8");
   if (ic == (iconv_t) -1)
     {