about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xiconvdata/run-iconv-test.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 97eaebbb22..2b6f0adbb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-23  Florian Weimer  <fweimer@redhat.com>
+
+	* iconvdata/run-iconv-test.sh: Actually test iconv modules.
+
 2014-12-22  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_UTIMES): Do
diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh
index 5dfb69fe3a..1d0bf52748 100755
--- a/iconvdata/run-iconv-test.sh
+++ b/iconvdata/run-iconv-test.sh
@@ -189,7 +189,7 @@ 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`
-    if $PROG < $temp1 >/dev/null 2>&1 ; then
+    if $PROG -f $from -t UTF8 < $temp1 >/dev/null 2>&1 ; then
 	: # fall through
     else
 	status=$?