Date: Sat, 23 May 2026 19:55:17 +0000 From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1df431576f99 - main - sh/tests: Cut down builtins/read12.0 by 2 seconds Message-ID: <6a120625.45836.5e8588e2@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=1df431576f99c3cc26dd4ceb1a6eda864cc9f196 commit 1df431576f99c3cc26dd4ceb1a6eda864cc9f196 Author: Jilles Tjoelker <jilles@FreeBSD.org> AuthorDate: 2026-05-23 19:47:15 +0000 Commit: Jilles Tjoelker <jilles@FreeBSD.org> CommitDate: 2026-05-23 19:47:15 +0000 sh/tests: Cut down builtins/read12.0 by 2 seconds Since the test assumes a 250 ms response time, there is no need to delay for 3 seconds. Instead, delay for the minimum possible 1 second. Also, fix some assertions in builtins/read11.0 and builtins/read12.0. If `set -e` is in effect, `foo` in `foo && bar` is considered tested and therefore a failure does not cause the shell to exit. Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D55191 --- bin/sh/tests/builtins/read11.0 | 3 ++- bin/sh/tests/builtins/read12.0 | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bin/sh/tests/builtins/read11.0 b/bin/sh/tests/builtins/read11.0 index 07bd3e70644c..e57dfdbc0ea4 100644 --- a/bin/sh/tests/builtins/read11.0 +++ b/bin/sh/tests/builtins/read11.0 @@ -27,6 +27,7 @@ ts=$(date +%s%3N) 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 index 4551555adfed..3b501a56392b 100644 --- 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 @@ exec 3<fifo1 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 @@ te=$(date +%s%3N) 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" ]home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a120625.45836.5e8588e2>