1998-04-15 02:02:59 +02:00
|
|
|
#! /bin/sh -f
|
|
|
|
# Run available iconv(1) tests.
|
2005-09-29 23:43:12 +02:00
|
|
|
# Copyright (C) 1998-2002, 2005 Free Software Foundation, Inc.
|
1998-04-15 02:02:59 +02:00
|
|
|
# This file is part of the GNU C Library.
|
|
|
|
# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
#
|
2001-07-06 06:58:11 +02:00
|
|
|
|
1998-04-15 02:02:59 +02:00
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 06:58:11 +02:00
|
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
|
|
# License as published by the Free Software Foundation; either
|
|
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
1998-04-15 02:02:59 +02:00
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 06:58:11 +02:00
|
|
|
# Lesser General Public License for more details.
|
|
|
|
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
|
|
# License along with the GNU C Library; if not, write to the Free
|
|
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
# 02111-1307 USA.
|
1998-04-15 02:02:59 +02:00
|
|
|
|
|
|
|
codir=$1
|
|
|
|
|
|
|
|
# We use always the same temporary file.
|
|
|
|
temp1=$codir/iconvdata/iconv-test.xxx
|
|
|
|
temp2=$codir/iconvdata/iconv-test.yyy
|
|
|
|
|
|
|
|
trap "rm -f $temp1 $temp2" 1 2 3 15
|
|
|
|
|
|
|
|
# We must tell the iconv(1) program where the modules we want to use can
|
|
|
|
# be found.
|
|
|
|
GCONV_PATH=$codir/iconvdata
|
|
|
|
export GCONV_PATH
|
|
|
|
|
1998-05-18 13:43:16 +02:00
|
|
|
# We have to have some directories in the library path.
|
|
|
|
LIBPATH=$codir:$codir/iconvdata
|
|
|
|
|
1998-04-15 02:02:59 +02:00
|
|
|
# How the start the iconv(1) program.
|
1998-05-20 02:15:00 +02:00
|
|
|
ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
|
1998-05-20 01:18:44 +02:00
|
|
|
$codir/iconv/iconv_prog'
|
1998-04-15 02:02:59 +02:00
|
|
|
|
1999-12-28 08:12:35 +01:00
|
|
|
# Which echo?
|
|
|
|
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
|
|
|
|
ac_n=-n ac_c= ac_t=
|
|
|
|
else
|
|
|
|
ac_n= ac_c='\c' ac_t=
|
|
|
|
fi
|
|
|
|
|
1998-04-15 02:02:59 +02:00
|
|
|
# We read the file named TESTS. All non-empty lines not starting with
|
|
|
|
# `#' are interpreted as commands.
|
1998-04-21 20:15:51 +02:00
|
|
|
failed=0
|
|
|
|
while read from to subset targets; do
|
1998-04-15 02:02:59 +02:00
|
|
|
# Ignore empty and comment lines.
|
2001-01-20 22:20:46 +01:00
|
|
|
if test -z "$subset" || test "$from" = '#'; then continue; fi
|
1998-04-15 02:02:59 +02:00
|
|
|
|
1998-05-20 01:18:44 +02:00
|
|
|
# Expand the variables now.
|
|
|
|
PROG=`eval echo $ICONV`
|
|
|
|
|
2001-01-20 22:20:46 +01:00
|
|
|
if test -n "$targets"; then
|
|
|
|
for t in $targets; do
|
|
|
|
if test -f testdata/$from; then
|
2001-02-05 06:57:24 +01:00
|
|
|
echo $ac_n " test data: $from -> $t $ac_c"
|
2001-01-20 22:20:46 +01:00
|
|
|
$PROG -f $from -t $t testdata/$from > $temp1 ||
|
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 06:57:24 +01:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
2001-01-20 22:20:46 +01:00
|
|
|
echo $ac_n "OK$ac_c"
|
|
|
|
if test -s testdata/$from..$t; then
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp $temp1 testdata/$from..$t > /dev/null 2>&1 ||
|
2001-01-20 22:20:46 +01:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo $ac_n "/OK$ac_c"
|
|
|
|
fi
|
|
|
|
echo $ac_n " -> $from $ac_c"
|
|
|
|
$PROG -f $t -t $to -o $temp2 $temp1 ||
|
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 06:57:24 +01:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
2001-01-20 22:20:46 +01:00
|
|
|
echo $ac_n "OK$ac_c"
|
2004-12-22 21:10:10 +01:00
|
|
|
test -s $temp1 && cmp testdata/$from $temp2 > /dev/null 2>&1 ||
|
2001-01-20 22:20:46 +01:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "/OK"
|
|
|
|
rm -f $temp1 $temp2
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Now test some bigger text, entirely in ASCII. If ASCII is no subset
|
|
|
|
# of the coded character set we convert the text to this coded character
|
|
|
|
# set. Otherwise we convert to all the TARGETS.
|
|
|
|
if test $subset = Y; then
|
2001-02-05 06:57:24 +01:00
|
|
|
echo $ac_n " suntzu: $from -> $t -> $to $ac_c"
|
2001-01-20 22:20:46 +01:00
|
|
|
$PROG -f $from -t $t testdata/suntzus |
|
|
|
|
$PROG -f $t -t $to > $temp1 ||
|
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 06:57:24 +01:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
2001-01-20 22:20:46 +01:00
|
|
|
echo $ac_n "OK$ac_c"
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp testdata/suntzus $temp1 ||
|
2001-02-05 06:57:24 +01:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
2001-01-20 22:20:46 +01:00
|
|
|
echo "/OK"
|
|
|
|
fi
|
|
|
|
rm -f $temp1
|
2001-02-05 06:57:24 +01:00
|
|
|
|
|
|
|
# And tests where iconv(1) has to handle charmaps.
|
|
|
|
if test "$t" = UTF8; then tc=UTF-8; else tc="$t"; fi
|
|
|
|
if test -f ../localedata/charmaps/$from &&
|
|
|
|
test -f ../localedata/charmaps/$tc &&
|
Update.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/testdata/EUC-JISX0213: New file.
* iconvdata/testdata/EUC-JISX0213..UTF8: New file.
* iconvdata/testdata/SHIFT_JISX0213: New file.
* iconvdata/testdata/SHIFT_JISX0213..UTF8: New file.
* iconvdata/testdata/ISO-2022-JP-3: New file.
* iconvdata/testdata/ISO-2022-JP-3..UTF8: New file.
* iconvdata/TESTS: Add EUC-JISX0213, SHIFT_JISX0213, ISO-2022-JP-3.
* iconvdata/run-iconv-test.sh: Skip the charmap test if the charmap
contains comments indicating precomposed characters.
2002-04-21 Bruno Haible <bruno@clisp.org>
* iconvdata/iso-2022-jp-3.c: New file.
* iconvdata/gconv-modules (ISO-2022-JP-3): New module.
* iconvdata/Makefile (modules): Add ISO-2022-JP-3.
(LDFLAGS-ISO-2022-JP-3.so): New variable.
(ISO-2022-JP-3.so): Depend on libJIS.so and libJISX0213.so.
(distribute): Add iso-2022-jp-3.c.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/tst-table-to.c (main): Restore handling of
transliterations, broken by last patch.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/TESTS: Add IBM922, IBM1124, IBM1129.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Don't advance inptr
when there is not enough room in the output buffer.
* iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise.
2002-04-20 Bruno Haible <bruno@clisp.org>
* iconv/skeleton.c ({FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}): New
macros.
(RESET_INPUT_BUFFER): Use them instead of {MIN,MAX}_NEEDED_{FROM,TO}.
Also make this macro work if FROM_DIRECTION evaluates to 0.
(gconv_init): Use the new macros instead of {MIN,MAX}_NEEDED_{FROM,TO}.
(FUNCTION_NAME): Likewise, in the handling of unaligned accesses and
of consume_incomplete.
* iconvdata/cp1255.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to
4, not 8.
* iconvdata/cp1258.c: Likewise.
* iconvdata/ibm930.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 3,
not 2.
* iconvdata/ibm933.c: Likewise.
* iconvdata/ibm935.c: Likewise.
* iconvdata/ibm937.c: Likewise.
* iconvdata/ibm939.c: Likewise.
* iconvdata/iso-2022-cn.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 6, not 4.
* iconvdata/iso-2022-cn-ext.c: Likewise.
* iconvdata/iso-2022-jp.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}.
* iconvdata/tcvn5712-1.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_FROM to 1, not 2.
* iconvdata/euc-jisx0213.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4.
* iconvdata/shift_jisx0213.c: Likewise.
2002-05-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* sysdeps/powerpc/Makefile (sysdeps_routines): Add divdi3, cmpdi2,
shdi3, fixdfdi, fixsfdi in csu dir.
(shared-only-routines): Likewise.
* sysdeps/wordsize-32/cmpdi2.c: New file.
* sysdeps/wordsize-32/shdi3.c: New file.
* sysdeps/wordsize-32/fixdfdi.c: New file.
* sysdeps/wordsize-32/fixsfdi.c: New file.
* sysdeps/powerpc/Versions (__divdi3, __moddi3, __udivdi3, __umoddi3,
__ashldi3, __ashrdi3, __lshrdi3, __cmpdi2, __ucmpdi2, __fixdfdi,
__fixsfdi, __fixunsdfdi, __fixunssfdi): Export at GLIBC_2.0.
* sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl):
Only use va_arg if the argument will be used [PR libc/3259].
2002-05-06 Michael A. Schmidt <mmaass@us.ibm.com>
* catgets/catgets.c (catopen): Free buffer if internal catalog
open fails.
2002-05-14 Ulrich Drepper <drepper@redhat.com>
* debug/xtrace.sh: Make more robust. For realtime tracking use
non-buffering methods.
* debug/pcprofiledump.c: Implement -u option.
Patch by Roger Luethi <rl@hellgate.ch>.
2002-05-15 08:02:35 +02:00
|
|
|
test -f testdata/$from &&
|
|
|
|
! grep '<U....><U....>' ../localedata/charmaps/$from > /dev/null; then
|
2001-02-05 06:57:24 +01:00
|
|
|
echo $ac_n "test charmap: $from -> $t $ac_c"
|
|
|
|
$PROG -f ../localedata/charmaps/$from -t ../localedata/charmaps/$tc \
|
|
|
|
testdata/$from > $temp1 ||
|
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
|
|
|
echo "FAILED"; failed=1; continue; }
|
|
|
|
echo $ac_n "OK$ac_c"
|
|
|
|
if test -s testdata/$from..$t; then
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp $temp1 testdata/$from..$t > /dev/null 2>&1 ||
|
2001-02-05 06:57:24 +01:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo $ac_n "/OK$ac_c"
|
|
|
|
fi
|
|
|
|
echo $ac_n " -> $from $ac_c"
|
|
|
|
$PROG -t ../localedata/charmaps/$from -f ../localedata/charmaps/$tc \
|
|
|
|
-o $temp2 $temp1 ||
|
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
|
|
|
echo "FAILED"; failed=1; continue; }
|
|
|
|
echo $ac_n "OK$ac_c"
|
2004-12-22 21:10:10 +01:00
|
|
|
test -s $temp1 && cmp testdata/$from $temp2 > /dev/null 2>&1 ||
|
2001-02-05 06:57:24 +01:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "/OK"
|
|
|
|
rm -f $temp1 $temp2
|
|
|
|
fi
|
2001-01-20 22:20:46 +01:00
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
2005-09-29 23:43:12 +02:00
|
|
|
if test "$subset" == N; then
|
2001-04-12 22:26:40 +02:00
|
|
|
echo $ac_n " suntzu: ASCII -> $to -> ASCII $ac_c"
|
2001-01-20 22:20:46 +01:00
|
|
|
$PROG -f ASCII -t $to testdata/suntzus |
|
|
|
|
$PROG -f $to -t ASCII > $temp1 ||
|
2000-09-05 07:58:12 +02:00
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 06:57:24 +01:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
1999-12-28 08:12:35 +01:00
|
|
|
echo $ac_n "OK$ac_c"
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp testdata/suntzus $temp1 ||
|
2001-02-05 06:57:24 +01:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
1999-12-28 08:12:35 +01:00
|
|
|
echo "/OK"
|
2001-01-20 22:20:46 +01:00
|
|
|
fi
|
1998-04-15 02:02:59 +02:00
|
|
|
done < TESTS
|
|
|
|
|
2001-04-12 22:26:40 +02:00
|
|
|
# We read the file named TESTS2. All non-empty lines not starting with
|
|
|
|
# `#' are interpreted as commands.
|
|
|
|
while read utf8 from filename; do
|
|
|
|
# Ignore empty and comment lines.
|
|
|
|
if test -z "$filename" || test "$utf8" = '#'; then continue; fi
|
|
|
|
|
|
|
|
# Expand the variables now.
|
|
|
|
PROG=`eval echo $ICONV`
|
|
|
|
|
|
|
|
# Test conversion to the endianness dependent encoding.
|
|
|
|
echo $ac_n "test encoder: $utf8 -> $from $ac_c"
|
|
|
|
$PROG -f $utf8 -t $from < testdata/${filename}..${utf8} > $temp1
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp $temp1 testdata/${filename}..${from}.BE > /dev/null 2>&1 ||
|
|
|
|
cmp $temp1 testdata/${filename}..${from}.LE > /dev/null 2>&1 ||
|
2001-04-12 22:26:40 +02:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "OK"
|
|
|
|
|
|
|
|
# Test conversion from the endianness dependent encoding.
|
|
|
|
echo $ac_n "test decoder: $from -> $utf8 $ac_c"
|
|
|
|
$PROG -f $from -t $utf8 < testdata/${filename}..${from}.BE > $temp1
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp $temp1 testdata/${filename}..${utf8} > /dev/null 2>&1 ||
|
2001-04-12 22:26:40 +02:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
$PROG -f $from -t $utf8 < testdata/${filename}..${from}.LE > $temp1
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp $temp1 testdata/${filename}..${utf8} > /dev/null 2>&1 ||
|
2001-04-12 22:26:40 +02:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "OK"
|
|
|
|
|
|
|
|
# Test byte swapping behaviour.
|
|
|
|
echo $ac_n "test non-BOM: ${from}BE -> ${from}LE $ac_c"
|
|
|
|
$PROG -f ${from}BE -t ${from}LE < testdata/${filename}..${from}.BE > $temp1
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp $temp1 testdata/${filename}..${from}.LE > /dev/null 2>&1 ||
|
2001-04-12 22:26:40 +02:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "OK"
|
|
|
|
|
|
|
|
# Test byte swapping behaviour.
|
|
|
|
echo $ac_n "test non-BOM: ${from}LE -> ${from}BE $ac_c"
|
|
|
|
$PROG -f ${from}LE -t ${from}BE < testdata/${filename}..${from}.LE > $temp1
|
2004-12-22 21:10:10 +01:00
|
|
|
cmp $temp1 testdata/${filename}..${from}.BE > /dev/null 2>&1 ||
|
2001-04-12 22:26:40 +02:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "OK"
|
|
|
|
|
|
|
|
done < TESTS2
|
|
|
|
|
1998-04-21 20:15:51 +02:00
|
|
|
exit $failed
|
1998-04-15 02:02:59 +02:00
|
|
|
# Local Variables:
|
|
|
|
# mode:shell-script
|
|
|
|
# End:
|