diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-05-15 07:57:49 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-05-15 07:57:49 +0000 |
| commit | 78463734c14d180e4d8e16c6e66fb213fc3479c0 (patch) | |
| tree | 718b7357ea9e63d4a951a0a725105619b97d2977 /iconvdata | |
| parent | ef73dbc1301bc42c132d15ae6ca866233c0beeb4 (diff) | |
Updated to fedora-glibc-20080515T0735cvs/fedora-glibc-2_8_90-1
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/Makefile | 3 | ||||
| -rw-r--r-- | iconvdata/bug-iconv6.c | 2 | ||||
| -rwxr-xr-x | iconvdata/run-iconv-test.sh | 4 |
3 files changed, 6 insertions, 3 deletions
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) { diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh index 5f6339d2c8..4b8a1280af 100755 --- a/iconvdata/run-iconv-test.sh +++ b/iconvdata/run-iconv-test.sh @@ -1,6 +1,6 @@ #! /bin/sh -f # Run available iconv(1) tests. -# Copyright (C) 1998-2002, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1998-2002, 2005, 2006, 2008 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. # @@ -130,7 +130,7 @@ while read from to subset targets; do done fi - if test "$subset" == N; then + if test "$subset" = N; then echo $ac_n " suntzu: ASCII -> $to -> ASCII $ac_c" $PROG -f ASCII -t $to testdata/suntzus | $PROG -f $to -t ASCII > $temp1 || |