From 480bc72713c841bbf55f4a33fe9f11d2c304ef1a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 15 Apr 1998 00:02:59 +0000 Subject: Update. 1998-04-14 23:54 Ulrich Drepper * iconvdata/Makefile: Add rules to run tests. * iconvdata/TESTS: New file. * iconvdata/run-iconv-test.sh: New file. * iconv/iconv_prog.c (main): Call process_block with OUTPUT stream, not stdout. --- ChangeLog | 9 +++++++ iconv/iconv_prog.c | 2 +- iconvdata/TESTS | 30 +++++++++++++++++++++ iconvdata/run-iconv-test.sh | 61 +++++++++++++++++++++++++++++++++++++++++++ iconvdata/testdata/ISO-8859-1 | 12 +++++++++ 5 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 iconvdata/TESTS create mode 100755 iconvdata/run-iconv-test.sh create mode 100644 iconvdata/testdata/ISO-8859-1 diff --git a/ChangeLog b/ChangeLog index 5e9b62c..b860a45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1998-04-14 23:54 Ulrich Drepper + + * iconvdata/Makefile: Add rules to run tests. + * iconvdata/TESTS: New file. + * iconvdata/run-iconv-test.sh: New file. + + * iconv/iconv_prog.c (main): Call process_block with OUTPUT stream, + not stdout. + 1998-04-14 18:22 Ulrich Drepper * iconv/gconv_builtin.c (__gconv_get_builtin_trans): Initialize diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index f26b715..0c1b9d0 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -188,7 +188,7 @@ main (int argc, char *argv[]) error (EXIT_FAILURE, errno, _("error while closing input `%s'"), argv[remaining]); - if (process_block (cd, addr, st.st_size, stdout) < 0) + if (process_block (cd, addr, st.st_size, output) < 0) { /* Something went wrong. */ status = EXIT_FAILURE; diff --git a/iconvdata/TESTS b/iconvdata/TESTS new file mode 100644 index 0000000..809104d --- /dev/null +++ b/iconvdata/TESTS @@ -0,0 +1,30 @@ +# Available tests for iconv(1) (and therefore iconv(3)) in GNU libc. +# Copyright (C) 1998 Free Software Foundation, Inc. +# This file is part of the GNU C Library. +# Contributed by Ulrich Drepper , 1998. +# +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +# Each line consists of at least three entries: +# 1. input file name. +# 2. output file name; this is different from the input file name only for +# conversions which do not produce the same output when the transformation +# is applied back and forth. +# 3. +# ... +# N. target coded character set. + +ISO-8859-1 ISO-8859-1 UTF8 diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh new file mode 100755 index 0000000..2ef394d --- /dev/null +++ b/iconvdata/run-iconv-test.sh @@ -0,0 +1,61 @@ +#! /bin/sh -f +# Run available iconv(1) tests. +# Copyright (C) 1998 Free Software Foundation, Inc. +# This file is part of the GNU C Library. +# Contributed by Ulrich Drepper , 1998. +# +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +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 + +# How the start the iconv(1) program. +ICONV="$codir/elf/ld.so --library-path $codir $codir/iconv/iconv_prog" + +# We read the file named TESTS. All non-empty lines not starting with +# `#' are interpreted as commands. +while read from to targets; do + # Ignore empty and comment lines. + if test -z "$targets" || test "$from" = '#'; then continue; fi + + for t in $targets; do + $ICONV -f $from -t $t testdata/$from > $temp1 || + { echo "*** conversion from $from to $t failed"; exit 1; } + $ICONV -f $t -t $to -o $temp2 $temp1 || + { echo "*** conversion from $t to $to failed"; exit 1; } + test -s $temp1 && cmp testdata/$from $temp2 >& /dev/null || + { echo "*** $from -> $t -> $to conversion failed"; exit 1; } + + # All tests ok. + echo "$from -> $t -> $to ok" + #rm -f $name1 $name2 + done +done < TESTS + +exit $? +# Local Variables: +# mode:shell-script +# End: diff --git a/iconvdata/testdata/ISO-8859-1 b/iconvdata/testdata/ISO-8859-1 new file mode 100644 index 0000000..7d3f9b2 --- /dev/null +++ b/iconvdata/testdata/ISO-8859-1 @@ -0,0 +1,12 @@ + ! " # $ % & ' ( ) * + , - . / + 0 1 2 3 4 5 6 7 8 9 : ; < = > ? + @ A B C D E F G H I J K L M N O + P Q R S T U V W X Y Z [ \ ] ^ _ + ` a b c d e f g h i j k l m n o + p q r s t u v w x y z { | } ~ +   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ + ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ + À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï + Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß + à á â ã ä å æ ç è é ê ë ì í î ï + ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ -- cgit v1.1