From 6fb54a225415a91050eb004d05bc62d6c3ca2b53 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@codesourcery.com>
Date: Mon, 22 Oct 2012 17:12:17 +0000
Subject: Don't pass shell loops' stdin to programs run on glibc's host.

---
 iconvdata/run-iconv-test.sh | 12 ++++++------
 iconvdata/tst-tables.sh     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'iconvdata')

diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh
index 34c400d7e9..cb9f5dffb2 100755
--- a/iconvdata/run-iconv-test.sh
+++ b/iconvdata/run-iconv-test.sh
@@ -61,7 +61,7 @@ while read from to subset targets; do
     for t in $targets; do
       if test -f testdata/$from; then
 	echo $ac_n "   test data: $from -> $t $ac_c"
-	$PROG -f $from -t $t testdata/$from > $temp1 ||
+	$PROG -f $from -t $t testdata/$from < /dev/null > $temp1 ||
 	  { if test $? -gt 128; then exit 1; fi
 	    echo "FAILED"; failed=1; continue; }
 	echo $ac_n "OK$ac_c"
@@ -71,7 +71,7 @@ while read from to subset targets; do
 	  echo $ac_n "/OK$ac_c"
 	fi
 	echo $ac_n " -> $from $ac_c"
-	$PROG -f $t -t $to -o $temp2 $temp1 ||
+	$PROG -f $t -t $to -o $temp2 $temp1 < /dev/null ||
 	  { if test $? -gt 128; then exit 1; fi
 	    echo "FAILED"; failed=1; continue; }
 	echo $ac_n "OK$ac_c"
@@ -87,7 +87,7 @@ while read from to subset targets; do
       # set.  Otherwise we convert to all the TARGETS.
       if test $subset = Y; then
 	echo $ac_n "      suntzu: $from -> $t -> $to $ac_c"
-	$PROG -f $from -t $t testdata/suntzus |
+	$PROG -f $from -t $t testdata/suntzus < /dev/null |
 	$PROG -f $t -t $to > $temp1 ||
 	  { if test $? -gt 128; then exit 1; fi
 	    echo "FAILED"; failed=1; continue; }
@@ -106,7 +106,7 @@ while read from to subset targets; do
 	 ! grep '<U....><U....>' ../localedata/charmaps/$from > /dev/null; then
 	echo $ac_n "test charmap: $from -> $t $ac_c"
 	$PROG -f ../localedata/charmaps/$from -t ../localedata/charmaps/$tc \
-	      testdata/$from > $temp1 ||
+	      testdata/$from < /dev/null > $temp1 ||
 	  { if test $? -gt 128; then exit 1; fi
 	    echo "FAILED"; failed=1; continue; }
 	echo $ac_n "OK$ac_c"
@@ -117,7 +117,7 @@ while read from to subset targets; do
 	fi
 	echo $ac_n " -> $from $ac_c"
 	$PROG -t ../localedata/charmaps/$from -f ../localedata/charmaps/$tc \
-	      -o $temp2 $temp1 ||
+	      -o $temp2 $temp1 < /dev/null ||
 	  { if test $? -gt 128; then exit 1; fi
 	    echo "FAILED"; failed=1; continue; }
 	echo $ac_n "OK$ac_c"
@@ -132,7 +132,7 @@ while read from to subset targets; do
 
   if test "$subset" = N; then
     echo $ac_n "      suntzu: ASCII -> $to -> ASCII $ac_c"
-    $PROG -f ASCII -t $to testdata/suntzus |
+    $PROG -f ASCII -t $to testdata/suntzus < /dev/null |
     $PROG -f $to -t ASCII > $temp1 ||
       { if test $? -gt 128; then exit 1; fi
 	echo "FAILED"; failed=1; continue; }
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index f65b72d6fa..eaf84dc2f4 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -263,7 +263,7 @@ while read charset charmap; do
   case ${charset} in \#*) continue;; esac
   echo -n "Testing ${charset}" 1>&2
   if ${SHELL} tst-table.sh ${common_objpfx} ${objpfx} "${run_program_prefix}" \
-      ${charset} ${charmap}; then
+      ${charset} ${charmap} < /dev/null; then
     echo 1>&2
   else
     echo "failed: ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}"
-- 
cgit v1.2.3