diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | iconvdata/Makefile | 3 | ||||
| -rw-r--r-- | iconvdata/bug-iconv6.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 36d17a8094..7e6fb39498 100644 --- 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 index 1a46a64ccd..e93de56c50 100644 --- 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 index f920954bc2..b364f4c161 100644 --- 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) { |