Don't pass shell loops' stdin to programs run on glibc's host.

diff --git a/ChangeLog b/ChangeLog
index 296bc423d1c5b16fd7caf31827eefdd35ec17612..221bc542d3fa0572ca7ee7a0aacf799d78047150 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-10-22  Jim Blandy  <jimb@codesourcery.com>
+           Joseph Myers  <joseph@codesourcery.com>
+
+       * iconvdata/run-iconv-test.sh: Redirect iconv stdin in loops from
+       /dev/null.
+       * iconvdata/tst-tables.sh: Redirect tst-table.sh stdin in loop
+       from /dev/null
+       * posix/tst-getconf.sh: Redirect getconf stdin in loop from
+       /dev/null.
+
 2012-10-22  Andreas Jaeger  <aj@suse.de>
 
        * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (__O_LARGEFILE):

diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh
index 34c400d7e927e131caccde3454de2636ad78cd72..cb9f5dffb219e7fc0b5b011af99c9c06cb3e8ec0 100755 (executable)
--- 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 f65b72d6fa8bde98e00d7c1911a3fd0908067c19..eaf84dc2f42ddcc6944492754951f654a8f2ed0f 100755 (executable)
--- 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}"

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7f57b6e243046f7ef0d8346dcde4190d87dd09a0..7ae362c157894d1667b354ed5076aa8605b6f344 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-22  Jim Blandy  <jimb@codesourcery.com>
+           Joseph Myers  <joseph@codesourcery.com>
+
+       * tst-fmon.sh: Redirect test program stdin in loop from /dev/null.
+       * tst-numeric.sh: Likewise.
+       * tst-rpmatch.sh: Likewise.
+
 2012-10-19  Jim Blandy  <jimb@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>
 

diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index 3e3dba945340476cdff77b07673ca580133d3727..52d32d0a9b995c26c0c8ddb5ee84a04df08efed0 100755 (executable)
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -48,7 +48,7 @@ while IFS="   " read locale format value expect; do
        LOCPATH=${common_objpfx}localedata \
        GCONV_PATH=${common_objpfx}/iconvdata \
        ${run_program_prefix} ${common_objpfx}localedata/tst-fmon \
-       "$locale" "$format" "$value" "$expect" ||
+       "$locale" "$format" "$value" "$expect" < /dev/null ||
        errcode=$?
     fi
 done < $datafile

diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh
index 71a305832e7cd37f14181cb11ec816360fae40da..70ddc405d6096e9b6eb17312ef0a2d7a96223f9b 100644 (file)
--- a/localedata/tst-numeric.sh
+++ b/localedata/tst-numeric.sh
@@ -33,7 +33,7 @@ while IFS="   " read locale format value expect; do
        if LOCPATH=${common_objpfx}localedata \
            GCONV_PATH=${common_objpfx}/iconvdata \
            ${run_program_prefix} ${common_objpfx}localedata/tst-numeric \
-           "$locale" "$format" "$value" "$expect"
+           "$locale" "$format" "$value" "$expect" < /dev/null
        then
            echo "Locale: \"${locale}\" Format: \"${format}\"" \
                 "Value: \"${value}\" Expect: \"${expect}\"  passed"

diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh
index 0fb0cdf1eab4bc0ab8848141184bf9bdd021c7a8..87888792714c6c9f27af9fa2a09b4b33fbb6170d 100755 (executable)
--- a/localedata/tst-rpmatch.sh
+++ b/localedata/tst-rpmatch.sh
@@ -28,7 +28,7 @@ while IFS=\& read locale string result dummy; do
     if [ "$locale" != "#" ]; then
        LOCPATH=${common_objpfx}localedata \
        GCONV_PATH=${common_objpfx}/iconvdata \
-       ${tst_rpmatch} $locale $string $result \
+       ${tst_rpmatch} $locale $string $result < /dev/null \
        || { echo "$locale $string $result  FAILED"; exit 1; }
     fi
 done <<EOF

diff --git a/posix/tst-getconf.sh b/posix/tst-getconf.sh
index b602f3e92b48dff0a3d7ada0c42ce2c9a88085af..701164b4a03aac2c4f4227ddd315f5e2df53eeeb 100644 (file)
--- a/posix/tst-getconf.sh
+++ b/posix/tst-getconf.sh
@@ -34,7 +34,7 @@ rm -f $logfile
 result=0
 while read name; do
   echo -n "getconf $name: " >> $logfile
-  ${run_getconf} "$name" 2>> $logfile >> $logfile
+  ${run_getconf} "$name" < /dev/null 2>> $logfile >> $logfile
   if test $? -ne 0; then
     echo "*** $name FAILED" >> $logfile
     result=1
@@ -212,7 +212,7 @@ EOF
 
 while read name; do
   echo -n "getconf $name /: " >> $logfile
-  ${run_getconf} "$name" / 2>> $logfile >> $logfile
+  ${run_getconf} "$name" / < /dev/null 2>> $logfile >> $logfile
   if test $? -ne 0; then
     echo "*** $name FAILED" >> $logfile
     result=1