2016-01-07 08:51:53 +00:00
|
|
|
#!/bin/sh -f
|
1998-04-15 00:02:59 +00:00
|
|
|
# Run available iconv(1) tests.
|
2018-01-01 00:32:25 +00:00
|
|
|
# Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
1998-04-15 00:02:59 +00:00
|
|
|
# This file is part of the GNU C Library.
|
|
|
|
# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
2001-07-06 04:58:11 +00:00
|
|
|
|
1998-04-15 00:02:59 +00:00
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00: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 00:02:59 +00: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 04:58:11 +00:00
|
|
|
# Lesser General Public License for more details.
|
|
|
|
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
# License along with the GNU C Library; if not, see
|
|
|
|
# <http://www.gnu.org/licenses/>.
|
1998-04-15 00:02:59 +00:00
|
|
|
|
2012-09-24 20:52:13 +00:00
|
|
|
set -e
|
|
|
|
|
1998-04-15 00:02:59 +00:00
|
|
|
codir=$1
|
Don't require test wrappers to preserve environment variables, use more consistent environment.
One wart in the original support for test wrappers for cross testing,
as noted in
<https://sourceware.org/ml/libc-alpha/2012-10/msg00722.html>, is the
requirement for test wrappers to pass a poorly-defined set of
environment variables from the build system to the system running the
glibc under test. Although some variables are passed explicitly via
$(test-wrapper-env), including LD_* variables that simply can't be
passed implicitly because of the side effects they'd have on the build
system's dynamic linker, others are passed implicitly, including
variables such as GCONV_PATH and LOCPATH that could potentially affect
the build system's libc (so effectively relying on any such effects
not breaking the wrappers). In addition, the code in
cross-test-ssh.sh for preserving environment variables is fragile (it
depends on how bash formats a list of exported variables, and could
well break for multi-line variable definitions where the contents
contain things looking like other variable definitions).
This patch moves to explicitly passing environment variables via
$(test-wrapper-env). Makefile variables that previously used
$(test-wrapper) are split up into -before-env and -after-env parts
that can be passed separately to the various .sh files used in
testing, so those files can then insert environment settings between
the two parts.
The common default environment settings in make-test-out are made into
a separate makefile variable that can also be passed to scripts,
rather than many scripts duplicating those settings (for testing an
installed glibc, it is desirable to have the GCONV_PATH setting on
just one place, so just that one place needs to support it pointing to
an installed sysroot instead of the build tree). The default settings
are included in the variables such as $(test-program-prefix), so that
if tests do not need any non-default settings they can continue to use
single variables rather than the split-up variables.
Although this patch cleans up LC_ALL=C settings (that being part of
the common defaults), various LANG=C and LANGUAGE=C settings remain.
Those are generally unnecessary and I propose a subsequent cleanup to
remove them. LC_ALL takes precedence over LANG, and while LANGUAGE
takes precedence over LC_ALL, it only does so for settings other than
LC_ALL=C. So LC_ALL=C on its own is sufficient to ensure the C
locale, and anything that gets LC_ALL=C does not need the other
settings.
While preparing this patch I noticed some tests with .sh files that
appeared to do nothing beyond what the generic makefile support for
tests can do (localedata/tst-wctype.sh - the makefiles support -ENV
variables and .input files - and localedata/tst-mbswcs.sh - just runs
five tests that could be run individually from the makefile). So I
propose another subsequent cleanup to move those to using the generic
support instead of special .sh files.
Tested x86_64 (native) and powerpc32 (cross).
* Makeconfig (run-program-env): New variable.
(run-program-prefix-before-env): Likewise.
(run-program-prefix-after-env): Likewise.
(run-program-prefix): Define in terms of new variables.
(built-program-cmd-before-env): New variable.
(built-program-cmd-after-env): Likewise.
(built-program-cmd): Define in terms of new variables.
(test-program-prefix-before-env): New variable.
(test-program-prefix-after-env): Likewise.
(test-program-prefix): Define in terms of new variables.
(test-program-cmd-before-env): New variable.
(test-program-cmd-after-env): Likewise.
(test-program-cmd): Define in terms of new variables.
* Rules (make-test-out): Use $(run-program-env).
* scripts/cross-test-ssh.sh (env_blacklist): Remove variable.
(help): Do not mention environment variables. Mention
--timeoutfactor option.
(timeoutfactor): New variable.
(blacklist_exports): Remove function.
(exports): Remove variable.
(command): Do not include ${exports}.
* manual/install.texi (Configuring and compiling): Do not mention
test wrappers preserving environment variables. Mention that last
assignment to a variable must take precedence.
* INSTALL: Regenerated.
* benchtests/Makefile (run-bench): Use $(run-program-env).
* catgets/Makefile ($(objpfx)test1.cat): Use
$(built-program-cmd-before-env), $(run-program-env) and
$(built-program-cmd-after-env).
($(objpfx)test2.cat): Do not specify environment variables
explicitly.
($(objpfx)de/libc.cat): Use $(built-program-cmd-before-env),
$(run-program-env) and $(built-program-cmd-after-env).
($(objpfx)test-gencat.out): Use $(test-program-cmd-before-env),
$(run-program-env) and $(test-program-cmd-after-env).
($(objpfx)sample.SJIS.cat): Do not specify environment variables
explicitly.
* catgets/test-gencat.sh: Use test_program_cmd_before_env,
run_program_env and test_program_cmd_after_env arguments.
* elf/Makefile ($(objpfx)tst-pathopt.out): Use $(run-program-env).
* elf/tst-pathopt.sh: Use run_program_env argument.
* iconvdata/Makefile ($(objpfx)iconv-test.out): Use
$(test-wrapper-env) and $(run-program-env).
* iconvdata/run-iconv-test.sh: Use test_wrapper_env and
run_program_env arguments.
* iconvdata/tst-table.sh: Do not set GCONV_PATH explicitly.
* intl/Makefile ($(objpfx)tst-gettext.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
($(objpfx)tst-gettext2.out): Likewise.
* intl/tst-gettext.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* intl/tst-gettext2.sh: Likewise.
* intl/tst-gettext4.sh: Do not set environment variables
explicitly.
* intl/tst-gettext6.sh: Likewise.
* intl/tst-translit.sh: Likewise.
* malloc/Makefile ($(objpfx)tst-mtrace.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
* malloc/tst-mtrace.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* math/Makefile (run-regen-ulps): Use $(run-program-env).
* nptl/Makefile ($(objpfx)tst-tls6.out): Use $(run-program-env).
* nptl/tst-tls6.sh: Use run_program_env argument. Set LANG=C
explicitly with each use of ${test_wrapper_env}.
* posix/Makefile ($(objpfx)wordexp-tst.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
* posix/tst-getconf.sh: Do not set environment variables
explicitly.
* posix/wordexp-tst.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* stdio-common/tst-printf.sh: Do not set environment variables
explicitly.
* stdlib/Makefile ($(objpfx)tst-fmtmsg.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
* stdlib/tst-fmtmsg.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
Split $test calls into $test_pre and $test.
* timezone/Makefile (build-testdata): Use
$(built-program-cmd-before-env), $(run-program-env) and
$(built-program-cmd-after-env).
localedata/ChangeLog:
* Makefile ($(addprefix $(objpfx),$(CTYPE_FILES))): Use
$(built-program-cmd-before-env), $(run-program-env) and
$(built-program-cmd-after-env).
($(objpfx)sort-test.out): Use $(test-program-prefix-before-env),
$(run-program-env) and $(test-program-prefix-after-env).
($(objpfx)tst-fmon.out): Use $(run-program-prefix-before-env),
$(run-program-env) and $(run-program-prefix-after-env).
($(objpfx)tst-locale.out): Use $(built-program-cmd-before-env),
$(run-program-env) and $(built-program-cmd-after-env).
($(objpfx)tst-trans.out): Use $(run-program-prefix-before-env),
$(run-program-env), $(run-program-prefix-after-env),
$(test-program-prefix-before-env) and
$(test-program-prefix-after-env).
($(objpfx)tst-ctype.out): Use $(test-program-cmd-before-env),
$(run-program-env) and $(test-program-cmd-after-env).
($(objpfx)tst-wctype.out): Likewise.
($(objpfx)tst-langinfo.out): Likewise.
($(objpfx)tst-langinfo-static.out): Likewise.
* gen-locale.sh: Use localedef_before_env, run_program_env and
localedef_after_env arguments.
* sort-test.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* tst-ctype.sh: Use tst_ctype_before_env, run_program_env and
tst_ctype_after_env arguments.
* tst-fmon.sh: Use run_program_prefix_before_env, run_program_env
and run_program_prefix_after_env arguments.
* tst-langinfo.sh: Use tst_langinfo_before_env, run_program_env
and tst_langinfo_after_env arguments.
* tst-locale.sh: Use localedef_before_env, run_program_env and
localedef_after_env arguments.
* tst-mbswcs.sh: Do not set environment variables explicitly.
* tst-numeric.sh: Likewise.
* tst-rpmatch.sh: Likewise.
* tst-trans.sh: Use run_program_prefix_before_env,
run_program_env, run_program_prefix_after_env,
test_program_prefix_before_env and test_program_prefix_after_env
arguments.
* tst-wctype.sh: Use tst_wctype_before_env, run_program_env and
tst_wctype_after_env arguments.
2014-06-06 22:19:27 +00:00
|
|
|
test_wrapper_env="$2"
|
|
|
|
run_program_env="$3"
|
1998-04-15 00:02:59 +00:00
|
|
|
|
|
|
|
# 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
|
|
|
|
|
1998-05-18 11:43:16 +00:00
|
|
|
# We have to have some directories in the library path.
|
|
|
|
LIBPATH=$codir:$codir/iconvdata
|
|
|
|
|
1998-04-15 00:02:59 +00:00
|
|
|
# How the start the iconv(1) program.
|
1998-05-20 00:15:00 +00:00
|
|
|
ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
|
1998-05-19 23:18:44 +00:00
|
|
|
$codir/iconv/iconv_prog'
|
Don't require test wrappers to preserve environment variables, use more consistent environment.
One wart in the original support for test wrappers for cross testing,
as noted in
<https://sourceware.org/ml/libc-alpha/2012-10/msg00722.html>, is the
requirement for test wrappers to pass a poorly-defined set of
environment variables from the build system to the system running the
glibc under test. Although some variables are passed explicitly via
$(test-wrapper-env), including LD_* variables that simply can't be
passed implicitly because of the side effects they'd have on the build
system's dynamic linker, others are passed implicitly, including
variables such as GCONV_PATH and LOCPATH that could potentially affect
the build system's libc (so effectively relying on any such effects
not breaking the wrappers). In addition, the code in
cross-test-ssh.sh for preserving environment variables is fragile (it
depends on how bash formats a list of exported variables, and could
well break for multi-line variable definitions where the contents
contain things looking like other variable definitions).
This patch moves to explicitly passing environment variables via
$(test-wrapper-env). Makefile variables that previously used
$(test-wrapper) are split up into -before-env and -after-env parts
that can be passed separately to the various .sh files used in
testing, so those files can then insert environment settings between
the two parts.
The common default environment settings in make-test-out are made into
a separate makefile variable that can also be passed to scripts,
rather than many scripts duplicating those settings (for testing an
installed glibc, it is desirable to have the GCONV_PATH setting on
just one place, so just that one place needs to support it pointing to
an installed sysroot instead of the build tree). The default settings
are included in the variables such as $(test-program-prefix), so that
if tests do not need any non-default settings they can continue to use
single variables rather than the split-up variables.
Although this patch cleans up LC_ALL=C settings (that being part of
the common defaults), various LANG=C and LANGUAGE=C settings remain.
Those are generally unnecessary and I propose a subsequent cleanup to
remove them. LC_ALL takes precedence over LANG, and while LANGUAGE
takes precedence over LC_ALL, it only does so for settings other than
LC_ALL=C. So LC_ALL=C on its own is sufficient to ensure the C
locale, and anything that gets LC_ALL=C does not need the other
settings.
While preparing this patch I noticed some tests with .sh files that
appeared to do nothing beyond what the generic makefile support for
tests can do (localedata/tst-wctype.sh - the makefiles support -ENV
variables and .input files - and localedata/tst-mbswcs.sh - just runs
five tests that could be run individually from the makefile). So I
propose another subsequent cleanup to move those to using the generic
support instead of special .sh files.
Tested x86_64 (native) and powerpc32 (cross).
* Makeconfig (run-program-env): New variable.
(run-program-prefix-before-env): Likewise.
(run-program-prefix-after-env): Likewise.
(run-program-prefix): Define in terms of new variables.
(built-program-cmd-before-env): New variable.
(built-program-cmd-after-env): Likewise.
(built-program-cmd): Define in terms of new variables.
(test-program-prefix-before-env): New variable.
(test-program-prefix-after-env): Likewise.
(test-program-prefix): Define in terms of new variables.
(test-program-cmd-before-env): New variable.
(test-program-cmd-after-env): Likewise.
(test-program-cmd): Define in terms of new variables.
* Rules (make-test-out): Use $(run-program-env).
* scripts/cross-test-ssh.sh (env_blacklist): Remove variable.
(help): Do not mention environment variables. Mention
--timeoutfactor option.
(timeoutfactor): New variable.
(blacklist_exports): Remove function.
(exports): Remove variable.
(command): Do not include ${exports}.
* manual/install.texi (Configuring and compiling): Do not mention
test wrappers preserving environment variables. Mention that last
assignment to a variable must take precedence.
* INSTALL: Regenerated.
* benchtests/Makefile (run-bench): Use $(run-program-env).
* catgets/Makefile ($(objpfx)test1.cat): Use
$(built-program-cmd-before-env), $(run-program-env) and
$(built-program-cmd-after-env).
($(objpfx)test2.cat): Do not specify environment variables
explicitly.
($(objpfx)de/libc.cat): Use $(built-program-cmd-before-env),
$(run-program-env) and $(built-program-cmd-after-env).
($(objpfx)test-gencat.out): Use $(test-program-cmd-before-env),
$(run-program-env) and $(test-program-cmd-after-env).
($(objpfx)sample.SJIS.cat): Do not specify environment variables
explicitly.
* catgets/test-gencat.sh: Use test_program_cmd_before_env,
run_program_env and test_program_cmd_after_env arguments.
* elf/Makefile ($(objpfx)tst-pathopt.out): Use $(run-program-env).
* elf/tst-pathopt.sh: Use run_program_env argument.
* iconvdata/Makefile ($(objpfx)iconv-test.out): Use
$(test-wrapper-env) and $(run-program-env).
* iconvdata/run-iconv-test.sh: Use test_wrapper_env and
run_program_env arguments.
* iconvdata/tst-table.sh: Do not set GCONV_PATH explicitly.
* intl/Makefile ($(objpfx)tst-gettext.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
($(objpfx)tst-gettext2.out): Likewise.
* intl/tst-gettext.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* intl/tst-gettext2.sh: Likewise.
* intl/tst-gettext4.sh: Do not set environment variables
explicitly.
* intl/tst-gettext6.sh: Likewise.
* intl/tst-translit.sh: Likewise.
* malloc/Makefile ($(objpfx)tst-mtrace.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
* malloc/tst-mtrace.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* math/Makefile (run-regen-ulps): Use $(run-program-env).
* nptl/Makefile ($(objpfx)tst-tls6.out): Use $(run-program-env).
* nptl/tst-tls6.sh: Use run_program_env argument. Set LANG=C
explicitly with each use of ${test_wrapper_env}.
* posix/Makefile ($(objpfx)wordexp-tst.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
* posix/tst-getconf.sh: Do not set environment variables
explicitly.
* posix/wordexp-tst.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* stdio-common/tst-printf.sh: Do not set environment variables
explicitly.
* stdlib/Makefile ($(objpfx)tst-fmtmsg.out): Use
$(test-program-prefix-before-env), $(run-program-env) and
$(test-program-prefix-after-env).
* stdlib/tst-fmtmsg.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
Split $test calls into $test_pre and $test.
* timezone/Makefile (build-testdata): Use
$(built-program-cmd-before-env), $(run-program-env) and
$(built-program-cmd-after-env).
localedata/ChangeLog:
* Makefile ($(addprefix $(objpfx),$(CTYPE_FILES))): Use
$(built-program-cmd-before-env), $(run-program-env) and
$(built-program-cmd-after-env).
($(objpfx)sort-test.out): Use $(test-program-prefix-before-env),
$(run-program-env) and $(test-program-prefix-after-env).
($(objpfx)tst-fmon.out): Use $(run-program-prefix-before-env),
$(run-program-env) and $(run-program-prefix-after-env).
($(objpfx)tst-locale.out): Use $(built-program-cmd-before-env),
$(run-program-env) and $(built-program-cmd-after-env).
($(objpfx)tst-trans.out): Use $(run-program-prefix-before-env),
$(run-program-env), $(run-program-prefix-after-env),
$(test-program-prefix-before-env) and
$(test-program-prefix-after-env).
($(objpfx)tst-ctype.out): Use $(test-program-cmd-before-env),
$(run-program-env) and $(test-program-cmd-after-env).
($(objpfx)tst-wctype.out): Likewise.
($(objpfx)tst-langinfo.out): Likewise.
($(objpfx)tst-langinfo-static.out): Likewise.
* gen-locale.sh: Use localedef_before_env, run_program_env and
localedef_after_env arguments.
* sort-test.sh: Use test_program_prefix_before_env,
run_program_env and test_program_prefix_after_env arguments.
* tst-ctype.sh: Use tst_ctype_before_env, run_program_env and
tst_ctype_after_env arguments.
* tst-fmon.sh: Use run_program_prefix_before_env, run_program_env
and run_program_prefix_after_env arguments.
* tst-langinfo.sh: Use tst_langinfo_before_env, run_program_env
and tst_langinfo_after_env arguments.
* tst-locale.sh: Use localedef_before_env, run_program_env and
localedef_after_env arguments.
* tst-mbswcs.sh: Do not set environment variables explicitly.
* tst-numeric.sh: Likewise.
* tst-rpmatch.sh: Likewise.
* tst-trans.sh: Use run_program_prefix_before_env,
run_program_env, run_program_prefix_after_env,
test_program_prefix_before_env and test_program_prefix_after_env
arguments.
* tst-wctype.sh: Use tst_wctype_before_env, run_program_env and
tst_wctype_after_env arguments.
2014-06-06 22:19:27 +00:00
|
|
|
ICONV="$test_wrapper_env $run_program_env $ICONV"
|
1998-04-15 00:02:59 +00:00
|
|
|
|
1999-12-28 07:12:35 +00: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 00:02:59 +00:00
|
|
|
# We read the file named TESTS. All non-empty lines not starting with
|
|
|
|
# `#' are interpreted as commands.
|
1998-04-21 18:15:51 +00:00
|
|
|
failed=0
|
|
|
|
while read from to subset targets; do
|
1998-04-15 00:02:59 +00:00
|
|
|
# Ignore empty and comment lines.
|
2001-01-20 21:20:46 +00:00
|
|
|
if test -z "$subset" || test "$from" = '#'; then continue; fi
|
1998-04-15 00:02:59 +00:00
|
|
|
|
1998-05-19 23:18:44 +00:00
|
|
|
# Expand the variables now.
|
|
|
|
PROG=`eval echo $ICONV`
|
|
|
|
|
2001-01-20 21:20:46 +00:00
|
|
|
if test -n "$targets"; then
|
|
|
|
for t in $targets; do
|
|
|
|
if test -f testdata/$from; then
|
2001-02-05 05:57:24 +00:00
|
|
|
echo $ac_n " test data: $from -> $t $ac_c"
|
2012-10-22 17:12:17 +00:00
|
|
|
$PROG -f $from -t $t testdata/$from < /dev/null > $temp1 ||
|
2001-01-20 21:20:46 +00:00
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 05:57:24 +00:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
2001-01-20 21:20:46 +00:00
|
|
|
echo $ac_n "OK$ac_c"
|
|
|
|
if test -s testdata/$from..$t; then
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp $temp1 testdata/$from..$t > /dev/null 2>&1 ||
|
2001-01-20 21:20:46 +00:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo $ac_n "/OK$ac_c"
|
|
|
|
fi
|
|
|
|
echo $ac_n " -> $from $ac_c"
|
2012-10-22 17:12:17 +00:00
|
|
|
$PROG -f $t -t $to -o $temp2 $temp1 < /dev/null ||
|
2001-01-20 21:20:46 +00:00
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 05:57:24 +00:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
2001-01-20 21:20:46 +00:00
|
|
|
echo $ac_n "OK$ac_c"
|
2006-08-01 06:46:18 +00:00
|
|
|
test -s $temp1 &&
|
|
|
|
LC_ALL=C cmp testdata/$from $temp2 > /dev/null 2>&1 ||
|
2001-01-20 21:20:46 +00: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 05:57:24 +00:00
|
|
|
echo $ac_n " suntzu: $from -> $t -> $to $ac_c"
|
2012-10-22 17:12:17 +00:00
|
|
|
$PROG -f $from -t $t testdata/suntzus < /dev/null |
|
2001-01-20 21:20:46 +00:00
|
|
|
$PROG -f $t -t $to > $temp1 ||
|
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 05:57:24 +00:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
2001-01-20 21:20:46 +00:00
|
|
|
echo $ac_n "OK$ac_c"
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp testdata/suntzus $temp1 ||
|
2001-02-05 05:57:24 +00:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
2001-01-20 21:20:46 +00:00
|
|
|
echo "/OK"
|
|
|
|
fi
|
|
|
|
rm -f $temp1
|
2001-02-05 05:57:24 +00: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 06:02:35 +00:00
|
|
|
test -f testdata/$from &&
|
|
|
|
! grep '<U....><U....>' ../localedata/charmaps/$from > /dev/null; then
|
2001-02-05 05:57:24 +00:00
|
|
|
echo $ac_n "test charmap: $from -> $t $ac_c"
|
|
|
|
$PROG -f ../localedata/charmaps/$from -t ../localedata/charmaps/$tc \
|
2012-10-22 17:12:17 +00:00
|
|
|
testdata/$from < /dev/null > $temp1 ||
|
2001-02-05 05:57:24 +00:00
|
|
|
{ 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
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp $temp1 testdata/$from..$t > /dev/null 2>&1 ||
|
2001-02-05 05:57:24 +00: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 \
|
2012-10-22 17:12:17 +00:00
|
|
|
-o $temp2 $temp1 < /dev/null ||
|
2001-02-05 05:57:24 +00:00
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
|
|
|
echo "FAILED"; failed=1; continue; }
|
|
|
|
echo $ac_n "OK$ac_c"
|
2006-08-01 06:46:18 +00:00
|
|
|
test -s $temp1 &&
|
|
|
|
LC_ALL=C cmp testdata/$from $temp2 > /dev/null 2>&1 ||
|
2001-02-05 05:57:24 +00:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "/OK"
|
|
|
|
rm -f $temp1 $temp2
|
|
|
|
fi
|
2001-01-20 21:20:46 +00:00
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
2008-05-15 01:59:59 +00:00
|
|
|
if test "$subset" = N; then
|
2001-04-12 20:26:40 +00:00
|
|
|
echo $ac_n " suntzu: ASCII -> $to -> ASCII $ac_c"
|
2012-10-22 17:12:17 +00:00
|
|
|
$PROG -f ASCII -t $to testdata/suntzus < /dev/null |
|
2001-01-20 21:20:46 +00:00
|
|
|
$PROG -f $to -t ASCII > $temp1 ||
|
2000-09-05 05:58:12 +00:00
|
|
|
{ if test $? -gt 128; then exit 1; fi
|
2001-02-05 05:57:24 +00:00
|
|
|
echo "FAILED"; failed=1; continue; }
|
1999-12-28 07:12:35 +00:00
|
|
|
echo $ac_n "OK$ac_c"
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp testdata/suntzus $temp1 ||
|
2001-02-05 05:57:24 +00:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
1999-12-28 07:12:35 +00:00
|
|
|
echo "/OK"
|
2001-01-20 21:20:46 +00:00
|
|
|
fi
|
1998-04-15 00:02:59 +00:00
|
|
|
done < TESTS
|
|
|
|
|
2001-04-12 20:26:40 +00: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
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp $temp1 testdata/${filename}..${from}.BE > /dev/null 2>&1 ||
|
|
|
|
LC_ALL=C cmp $temp1 testdata/${filename}..${from}.LE > /dev/null 2>&1 ||
|
2001-04-12 20:26:40 +00: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
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp $temp1 testdata/${filename}..${utf8} > /dev/null 2>&1 ||
|
2001-04-12 20:26:40 +00:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
$PROG -f $from -t $utf8 < testdata/${filename}..${from}.LE > $temp1
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp $temp1 testdata/${filename}..${utf8} > /dev/null 2>&1 ||
|
2001-04-12 20:26:40 +00: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
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp $temp1 testdata/${filename}..${from}.LE > /dev/null 2>&1 ||
|
2001-04-12 20:26:40 +00: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
|
2006-08-01 06:46:18 +00:00
|
|
|
LC_ALL=C cmp $temp1 testdata/${filename}..${from}.BE > /dev/null 2>&1 ||
|
2001-04-12 20:26:40 +00:00
|
|
|
{ echo "/FAILED"; failed=1; continue; }
|
|
|
|
echo "OK"
|
|
|
|
|
|
|
|
done < TESTS2
|
|
|
|
|
2014-09-03 17:45:43 +00:00
|
|
|
# Check for crashes in decoders.
|
|
|
|
printf '\016\377\377\377\377\377\377\377' > $temp1
|
|
|
|
for from in $iconv_modules ; do
|
|
|
|
echo $ac_n "test decoder $from $ac_c"
|
|
|
|
PROG=`eval echo $ICONV`
|
2014-12-23 15:16:32 +00:00
|
|
|
if $PROG -f $from -t UTF8 < $temp1 >/dev/null 2>&1 ; then
|
2014-09-03 17:45:43 +00:00
|
|
|
: # fall through
|
|
|
|
else
|
|
|
|
status=$?
|
|
|
|
if test $status -gt 1 ; then
|
|
|
|
echo "/FAILED"
|
|
|
|
failed=1
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
echo "OK"
|
|
|
|
done
|
|
|
|
|
1998-04-21 18:15:51 +00:00
|
|
|
exit $failed
|
1998-04-15 00:02:59 +00:00
|
|
|
# Local Variables:
|
|
|
|
# mode:shell-script
|
|
|
|
# End:
|