From nobody Sat May 23 19:55:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gNCYR2jszz6dj4t for ; Sat, 23 May 2026 19:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gNCYR1614z3RYT for ; Sat, 23 May 2026 19:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779566123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HGOhtqmXALuPduMEAz9ELFnmtsbR5Ligma4TPBJBVY=; b=DF04gQzxqr/5X5nZkQzbicr/DL+Lm2TkKNRECPT5nbuVVwD+UkEYEpEGT+3AFZJgCKjIwU TNhNcVHUjSTuecQZKP54wgKgLQXAqZIrus8SxuD9FuWiIxVrkjNskT3N9odjNGwGSr/a2j x4aAhHTSoRXoqKhHJ3IFD5mAMvZ5kIcM9Oht2seMMuIDx7zEogV2U+SMWTForHNV47UsNq nZpy5jR4cnz7RkZ5BE8klQPOJ/8/xq1w+CWntgdMYYd6CI5o9zWLh7w6oAiI2ZtoWmKdXv zmB1KrP+9iyFwcPnoHnAa7sc8aqKO4s/edgCn9dZKuSsmCSqgvUuhIVfYajUFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779566123; a=rsa-sha256; cv=none; b=LsRtqH3aCzdvNFDol+5n+a4oGXKGRC6l7mroEfbk7dFKpM1ky1KdPQQSxiquD88+MMYfrN /9HpBJ0tFOz/3wg8kJ5Ty6hQKXdFaVE7xPSoq9dALgw7CffwdAt0SSZpkuhW4GH9HNafTY GC5/zUieVMupMR0Tko/koX307C2kzkJWk7M8tKB/FOltp0QAtigrH6hmNQoOk6MFJmGy5V Fas4IoDzQXZdQcz91D1DP7oTWgj2lIYIQqP7AuuODLmeqKxxHo0CQDa4sX1HYz0baxd8nk YKPrT2vPpCq0HicnzwLOl/45+Tbec64NAF0GhE0/lCenEP2SBa9GQ8BnVDLafA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779566123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HGOhtqmXALuPduMEAz9ELFnmtsbR5Ligma4TPBJBVY=; b=RRzSxnyALKOiJhyClGHRugc+ubPmlg2GpgMaHeBv9pIwEmoxBG3QWX+gKStX/JJlT/tDXd 5LkRVPoM13m+ParObA5EjRY3Czkmgvg0QQAoSOItZqGym4P9p5IWZ6KrL7WJeuvy+15FcH bn5TWH8X8NoB90xH6Inv487NrLEO2T/pZh8kD8gVdyC9zOC3InGi0zTYLL0wfxyJqoFTJj 4vrhjqDLYZmgAYossDP6t5sH2ih4175b+83z85PbEDB++jJ6NSCxSDzVgwc7ov/vH8+bXM Y7C6pjfl7fXiW0PHbRqWYqcEr2rRoByx0CoABhSzpMyx+d/cOK1JtTR9Jt1G+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gNCYR0Dq9z6qL for ; Sat, 23 May 2026 19:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45836 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 23 May 2026 19:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jilles Tjoelker Subject: git: 1df431576f99 - main - sh/tests: Cut down builtins/read12.0 by 2 seconds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jilles X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1df431576f99c3cc26dd4ceb1a6eda864cc9f196 Auto-Submitted: auto-generated Date: Sat, 23 May 2026 19:55:17 +0000 Message-Id: <6a120625.45836.5e8588e2@gitrepo.freebsd.org> The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=1df431576f99c3cc26dd4ceb1a6eda864cc9f196 commit 1df431576f99c3cc26dd4ceb1a6eda864cc9f196 Author: Jilles Tjoelker AuthorDate: 2026-05-23 19:47:15 +0000 Commit: Jilles Tjoelker 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