Page MenuHomeFreeBSD

D55191.id.diff
No OneTemporary

D55191.id.diff

diff --git a/bin/sh/tests/builtins/read11.0 b/bin/sh/tests/builtins/read11.0
--- a/bin/sh/tests/builtins/read11.0
+++ b/bin/sh/tests/builtins/read11.0
@@ -27,6 +27,7 @@
read -t 0 v <&3 || r=$?
te=$(date +%s%3N)
kill -TERM "$!" || :
-[ "$r" -gt 128 ] && [ "$(kill -l "$r")" = ALRM ]
+[ "$r" -gt 128 ]
+[ "$(kill -l "$r")" = ALRM ]
[ $((te-ts)) -lt 250 ]
[ -z "$v" ]
diff --git a/bin/sh/tests/builtins/read12.0 b/bin/sh/tests/builtins/read12.0
--- a/bin/sh/tests/builtins/read12.0
+++ b/bin/sh/tests/builtins/read12.0
@@ -1,5 +1,5 @@
-# Verify that `read -t 3 v` succeeds immediately if input is available
-# and times out after 3 s if not
+# Verify that `read -t 1 v` succeeds immediately if input is available
+# and times out after 1 s if not
set -e
@@ -15,7 +15,7 @@
v=original_value
r=0
ts=$(date +%s%3N)
-read -t 3 v <&3 || r=$?
+read -t 1 v <&3 || r=$?
te=$(date +%s%3N)
[ "$r" -eq 0 ]
[ $((te-ts)) -lt 250 ]
@@ -24,9 +24,11 @@
v=original_value
r=0
ts=$(date +%s%3N)
-read -t 3 v <&3 || r=$?
+read -t 1 v <&3 || r=$?
te=$(date +%s%3N)
kill -TERM "$!" || :
-[ "$r" -gt 128 ] && [ "$(kill -l "$r")" = ALRM ]
-[ $((te-ts)) -gt 3000 ] && [ $((te-ts)) -lt 3250 ]
+[ "$r" -gt 128 ]
+[ "$(kill -l "$r")" = ALRM ]
+[ $((te-ts)) -ge 1000 ]
+[ $((te-ts)) -lt 1250 ]
[ -z "$v" ]

File Metadata

Mime Type
text/plain
Expires
Thu, May 14, 6:46 PM (10 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33054532
Default Alt Text
D55191.id.diff (1 KB)

Event Timeline