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

This commit is contained in:
Jim Blandy 2012-10-22 17:12:17 +00:00 committed by Joseph Myers
parent 2b4a59f535
commit 6fb54a2254
8 changed files with 29 additions and 12 deletions

View File

@ -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):

View File

@ -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; }

View File

@ -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}"

View File

@ -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>

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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