From nobody Mon Aug 3 11:38:38 2026 X-Original-To: dev-commits-src-branches@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 4hDF724V4hz6nCFl for ; Mon, 03 Aug 2026 11:38:38 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDF722SzWz3RjY for ; Mon, 03 Aug 2026 11:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785757118; 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=bgvwBK90p4zaT9k0fXcTXIziviGo1imXi+29WThSsjk=; b=GVYgdNCUAruv6zmk5muEJ6U1neVZntnRCjsdqWxziLR/WS8VGD1SRSfnzAbzNjd3hayFNJ 4yspwq96aJ8bfAcFT743Nhkocs5vxO6E2jclHqGzqKyeZhoqb7igDDZNH78KtfCAP8ZVOg eEXjARpQ/bwLt3dnmoklilbuhhugt1LAaTP9huDy4/2Tp9JHE0dcSAkNGJWn3XzA62uZQM BNVhmNnSeaE46NoAIg5+6Ndm3cod0Tq3so1eYUbKBlNVLAYMH1be/q+5d0u8TfwRY1Iuxh 2slmS3okuzTvhrTmwPt8EdoabMouwguyPLZkh4fmCu6joVCgkOEkhVpWgFTZZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785757118; a=rsa-sha256; cv=none; b=Kmsbrd/iLOdwYkddFvZjmT69bXXQrbk3qYBg8s17Hk3BWdG928jA56r8surQoT/PseyCwz +ZSlKcr4BR/rvHEy6HJY79OTZ7tsWwmTUhz+SpN0E0UKQZRktFux2jH7BUAxGS5g+OEbHf VOOzAJYYbE/okFTJX/HZJwhcO30cat80OVoTZzLE5XQOenPbqhggEvu6c35iOmuLGxag7N WlsVWi+oCdW0OhuT6vuV5ows3wj1M+rzFBJojOcOKBIidaunNuddnlQS2qxsrVqPWyf45E dzpUv6NBrBW6+e54DG8ec1xWXNYwBsQrZsL2B0LhM1kv/OfXuxKK3c1aSBUEpg== 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=1785757118; 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=bgvwBK90p4zaT9k0fXcTXIziviGo1imXi+29WThSsjk=; b=oxLSsEJQawtWTpkY0p09n2jSumGPXuqNl555urgsqz0wExVS51fQQRtUTGNJszA6JyEfli XnBMmN6n6GnYSX73bdcR2i+S1rG3/87t11Dky+mK7Um/a+8wcps79S4PWDM1o2fGlPvpaI X/eQ9M8lxCw1nJKY2c+xfPVwXhLyKL29T/ccer7IrNbqTle6+I1wLsIYBJMti4LkfvzMjc wNJRVI2TJwraKjniflb7kEOZguvl7ibcseeoF2oxLH4z5KTRClJUjYJOfIIu1sF3ebQiXb AdLCh/tHPDIVzbdoXoCaU1nCI6m6cOUnP40FWDl+oSxZL7iRuBBggh2iv/pg9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDF720vzfzymX for ; Mon, 03 Aug 2026 11:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 194dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 11:38:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c78190d2144e - stable/15 - pwait: Don't use init as a target List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c78190d2144ec2574bca0ba619a0b26b87371216 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 11:38:38 +0000 Message-Id: <6a707dbe.194dc.7f6e9043@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c78190d2144ec2574bca0ba619a0b26b87371216 commit c78190d2144ec2574bca0ba619a0b26b87371216 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-25 12:44:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-08-03 11:32:11 +0000 pwait: Don't use init as a target The time_unit test case uses PID 1 as a target for pwait. This doesn't work in a jail. Since all we need is a process that we know won't die while the test is running, we may as well use ourselves. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D58418 (cherry picked from commit 5922e9d7e72bfa8a85b0f37bcfd1a8b5d866ec3b) --- bin/pwait/tests/pwait_test.sh | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/bin/pwait/tests/pwait_test.sh b/bin/pwait/tests/pwait_test.sh index d31ca21cff93..0d4f53d2941d 100644 --- a/bin/pwait/tests/pwait_test.sh +++ b/bin/pwait/tests/pwait_test.sh @@ -56,31 +56,29 @@ time_unit_head() time_unit_body() { - init=1 - atf_check \ -o empty \ -e inline:"pwait: timeout unit\n" \ -s exit:65 \ - timeout --preserve-status 2 pwait -t 1d $init + timeout --preserve-status 2 pwait -t 1d $$ atf_check \ -o empty \ -e inline:"pwait: timeout unit\n" \ -s exit:65 \ - timeout --preserve-status 2 pwait -t 1d $init + timeout --preserve-status 2 pwait -t 1d $$ atf_check \ -o empty \ -e inline:"pwait: timeout value\n" \ -s exit:65 \ - timeout --preserve-status 2 pwait -t -1 $init + timeout --preserve-status 2 pwait -t -1 $$ atf_check \ -o empty \ -e inline:"pwait: timeout value\n" \ -s exit:65 \ - timeout --preserve-status 2 pwait -t 100000001 $init + timeout --preserve-status 2 pwait -t 100000001 $$ # These long duration cases are expected to timeout from the # timeout utility rather than pwait -t. @@ -88,37 +86,37 @@ time_unit_body() -o empty \ -e empty \ -s signal:15 \ - timeout --preserve-status 2 pwait -t 100000000 $init + timeout --preserve-status 2 pwait -t 100000000 $$ atf_check \ -o empty \ -e empty \ -s signal:15 \ - timeout --preserve-status 2 pwait -t 1h $init + timeout --preserve-status 2 pwait -t 1h $$ atf_check \ -o empty \ -e empty \ -s signal:15 \ - timeout --preserve-status 2 pwait -t 1.5h $init + timeout --preserve-status 2 pwait -t 1.5h $$ atf_check \ -o empty \ -e empty \ -s signal:15 \ - timeout --preserve-status 2 pwait -t 1m $init + timeout --preserve-status 2 pwait -t 1m $$ atf_check \ -o empty \ -e empty \ -s signal:15 \ - timeout --preserve-status 2 pwait -t 1.5m $init + timeout --preserve-status 2 pwait -t 1.5m $$ atf_check \ -o empty \ -e empty \ -s signal:15 \ - timeout --preserve-status 2 pwait -t 0 $init + timeout --preserve-status 2 pwait -t 0 $$ # The rest are fast enough that pwait -t is expected to trigger # the timeout. @@ -126,31 +124,31 @@ time_unit_body() -o empty \ -e empty \ -s exit:124 \ - timeout --preserve-status 2 pwait -t 1s $init + timeout --preserve-status 2 pwait -t 1s $$ atf_check \ -o empty \ -e empty \ -s exit:124 \ - timeout --preserve-status 2 pwait -t 1.5s $init + timeout --preserve-status 2 pwait -t 1.5s $$ atf_check \ -o empty \ -e empty \ -s exit:124 \ - timeout --preserve-status 2 pwait -t 1 $init + timeout --preserve-status 2 pwait -t 1 $$ atf_check \ -o empty \ -e empty \ -s exit:124 \ - timeout --preserve-status 2 pwait -t 1.5 $init + timeout --preserve-status 2 pwait -t 1.5 $$ atf_check \ -o empty \ -e empty \ -s exit:124 \ - timeout --preserve-status 2 pwait -t 0.5 $init + timeout --preserve-status 2 pwait -t 0.5 $$ } atf_test_case timeout_trigger_timeout