summaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorJim Blandy <jimb@codesourcery.com>2012-10-22 17:12:17 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-22 17:12:17 +0000
commit6fb54a225415a91050eb004d05bc62d6c3ca2b53 (patch)
tree5ac6cc960e031708a92f7d0308c2c3618943c6b5 /localedata
parent2b4a59f535079f07d7d63c3bab98e67263092c71 (diff)
Don't pass shell loops' stdin to programs run on glibc's host.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog7
-rwxr-xr-xlocaledata/tst-fmon.sh2
-rw-r--r--localedata/tst-numeric.sh2
-rwxr-xr-xlocaledata/tst-rpmatch.sh2
4 files changed, 10 insertions, 3 deletions
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 <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 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 <<EOF