about summary refs log tree commit diff
path: root/iconvdata/run-iconv-test.sh
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-21 18:15:51 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-21 18:15:51 +0000
commit5aa8ff620ef68811c5a7dd5d5bbac1c078730a2a (patch)
treeefd66893a0690109dc0898541cfa6d41b0bf5029 /iconvdata/run-iconv-test.sh
parent26e119f15e82aa334ad96f74513c4534daf4d35d (diff)
downloadglibc-5aa8ff620ef68811c5a7dd5d5bbac1c078730a2a.tar.gz
glibc-5aa8ff620ef68811c5a7dd5d5bbac1c078730a2a.tar.xz
glibc-5aa8ff620ef68811c5a7dd5d5bbac1c078730a2a.zip
Update.
1998-04-21 18:00  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv.c (__gconv): Remove bogus input buffer size computation.

	* iconv/gconv_open.c (__gconv_open): Initialize outbufend element.

	* iconv/gconv_simple.c (__gconv_transform_internal_ascii): Don't use
	character in comparison with uint32_t.
	(__gconv_transform_internal_utf8): Specify MAX_NEEDED_TO.
	(__gconv_transform_utf8_internal): Specify MAX_NEEDED_FROM.
	Optimize BODY a bit.

	* iconv/loop.c: Require MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT to
	be defined.

	* iconv/skeleton.c: Also reset converted counter in case of an error.
	Call reset function using correct value for output buffer start.

	* iconvdata/Makefile: Re-enable tests.

	* iconvdata/iso8859-1.c: Swap MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT
	value for to-conversion.

	* iconvdata/TESTS: Add new third column.
	* iconvdata/run-iconv-test.sh: Add support for charsets which are
	not ASCII based.
	* iconvdata/testdata/suntzus: New file.

	* elf/dl-minimal.c (__strtol_internal): Increment pointer to string
	while reading.  Correctly used base.  Little optimization.
	(__strtoul_internal): Likewise.

	* elf/rtld.c (dl_main): Test to avoid duplicate call of _dl_init_paths
	was wrong.  Use explicit variable.

1998-04-20 23:49  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* configure.in: Check for awk.
	* config.make.in: Add AWK to be substituted.

	* manual/xtract-typefun.awk: Rewrite to eliminate gawk extensions.
	* manual/users.texi: Fix typo exposed by above rewrite.

	* Makefile: Invoke awk using AWK variable.
	* csu/Makefile: Likewise.
	* elf/Makefile: Likewise.
	* mach/Makefile: Likewise.
	* manual/Makefile: Likewise.
	* sysdeps/gnu/Makefile: Likewise.
	* sysdeps/mach/hurd/Makefile: Likewise.
	* sysdeps/unix/Makefile: Likewise.
	* timezone/Makefile: Likewise.

1998-04-10  Gordon Matzigkeit  <gord@profitpress.com>

	* sysdeps/gnu/errlist.awk (ERR_REMAP): Implement error code to
	array index translation.
	(SYS_ERRLIST_ALIAS, SYS_NERR_ALIAS): Make weak aliases only if
	these are defined.

	* sysdeps/mach/hurd/Dist: Add errlist.c to distribution.

	* sysdeps/mach/hurd/errlist.c: New file.
	(ERR_TRANSLATE): Map Hurd error codes into errlist indices.
	(_hurd_errlist): The Hurd error list doesn't have Unix sys_errlist
	semantics, so rename it.

1998-04-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* iconvdata/run-iconv-test.sh: Make portable.  Always test all
	conversions.

1998-04-21 12:30  H.J. Lu  <hjl@gnu.org>

	* wcsmbs/wcsrtombs.c (__wcsrtombs): Initialize result to 0.
	* wcsmbs/wcsnrtombs.c: Likewise.

1998-04-21  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/dl-sysdep.c: Handle _dl_hwcap correctly.

	* wcsmbs/btowc.c (__btowc): Declare inptr as const char *.

	* time/strftime.c (my_strftime): Initialize pad variable in
	declaration.

	* iconvdata/big5.c: Don't use character constants in comparisons
	with unsigned value.

	* sysdeps/generic/setutxent.c: New file.
	* sysdeps/generic/getutxent.c: New file.
	* sysdeps/generic/endutxent.c: New file.
	* sysdeps/generic/getutxid.c: New file.
	* sysdeps/generic/getutxline.c: New file.
	* sysdeps/generic/pututxline.c: New file.
	* sysdeps/generic/utmpxname.c: New file.
	* sysdeps/generic/updwtmpx.c: New file.
Diffstat (limited to 'iconvdata/run-iconv-test.sh')
-rwxr-xr-xiconvdata/run-iconv-test.sh39
1 files changed, 26 insertions, 13 deletions
diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh
index af6a136c4a..45061373cf 100755
--- a/iconvdata/run-iconv-test.sh
+++ b/iconvdata/run-iconv-test.sh
@@ -37,37 +37,50 @@ 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
+failed=0
+while read from to subset 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; }
+      { echo "*** conversion from $from to $t failed"; failed=1; }
     if test -s testdata/$from..$t; then
       cmp $temp1 testdata/$from..$t >& /dev/null ||
-	{ echo "*** $from -> $t conversion failed"; exit 1; }
+	{ echo "*** $from -> $t conversion failed"; failed=1; }
     fi
     $ICONV -f $t -t $to -o $temp2 $temp1 ||
-      { echo "*** conversion from $t to $to failed"; exit 1; }
+      { echo "*** conversion from $t to $to failed"; failed=1; }
     test -s $temp1 && cmp testdata/$from $temp2 >& /dev/null ||
-      { echo "*** $from -> t -> $to conversion failed"; exit 1; }
+      { echo "*** $from -> t -> $to conversion failed"; failed=1; }
     rm -f $temp1 $temp2
 
-    # Now test some bigger text, entirely in ASCII.
-    $ICONV -f $from -t $t testdata/suntzus |
-    $ICONV -f $t -t $to > $temp1 ||
-      { echo "*** conversion $from->$t->$to of suntzus failed"; exit 1; }
-    cmp testdata/suntzus.txt $temp1 ||
-      { echo "*** conversion $from->$t->$to of suntzus incorrect"; exit 1; }
+    # Now test some bigger text, entirely in ASCII.  If ASCII is no subset
+    # of the coded character set we test we convert the test to this
+    # coded character set.  Otherwise we convert to all the TARGETS.
+    if test $subset = Y; then
+      $ICONV -f $from -t $t testdata/suntzus |
+      $ICONV -f $t -t $to > $temp1 ||
+	{ echo "*** conversion $from->$t->$to of suntzus failed"; failed=1; }
+      cmp testdata/suntzus $temp1 ||
+	{ echo "*** conversion $from->$t->$to of suntzus incorrect";
+	  failed=1; }
+    else
+      $ICONV -f ASCII -t $to testdata/suntzus |
+      $ICONV -f $to -f ASCII > $temp1 ||
+        { echo "*** conversion ASCII->$to->ASCII of suntzus failed";
+	  failed=1; }
+	cmp testdata/suntzus $temp1 ||
+        { echo "*** conversion ASCII->$to->ASCII of suntzus incorrect";
+	  failed=1; }
+    fi
     rm -f $temp1
-
     # All tests ok.
     echo "$from -> $t -> $to ok"
   done
 done < TESTS
 
-exit $?
+exit $failed
 # Local Variables:
 #  mode:shell-script
 # End: