From 6fb54a225415a91050eb004d05bc62d6c3ca2b53 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Mon, 22 Oct 2012 17:12:17 +0000 Subject: Don't pass shell loops' stdin to programs run on glibc's host. --- localedata/ChangeLog | 7 +++++++ localedata/tst-fmon.sh | 2 +- localedata/tst-numeric.sh | 2 +- localedata/tst-rpmatch.sh | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) (limited to 'localedata') diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 7f57b6e243..7ae362c157 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,10 @@ +2012-10-22 Jim Blandy + Joseph Myers + + * 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 Joseph Myers diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index 3e3dba9453..52d32d0a9b 100755 --- 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 71a305832e..70ddc405d6 100644 --- 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 0fb0cdf1ea..8788879271 100755 --- 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 <