From nobody Sat Jul 25 12:44:43 2026 X-Original-To: dev-commits-src-main@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 4h6l1S0NB5z6lLph for ; Sat, 25 Jul 2026 12:44:44 +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 4h6l1R6ZTMz3hB7 for ; Sat, 25 Jul 2026 12:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784983484; 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=uZ8pVHcePL0r+FUXH0hNeAx22JX4R1yRTIsbtbWalh4=; b=pEW88gYokt6jjeIL9poCaKy/1gZnohBPiDpIfAMtr68Lnp+/eEoXIKA1CWj/oLL3qoHpYd ukZe5OD5qrkSsLSH7YuF0Je639JpnF+Kyf27oVLe8QViShC2GHO6g2lzksbvXxjyyD7tWw mfPzhc/5FB/cPP+NUp6G1ed1gC8kgcIZvZVSSEmAmv8vfdMS09b52e+xv83gfG5BCUOCH6 p850IKVFeoK3flet/vABCxdk5ShOh8bMpXJmXunazkv52WgmoXuE3+maNtbcfvTll/C5m6 ZBGlzotznPM5dgK0m0DXi288neUb2P14tOSfe9dp1NcNA9OoDvQ+NYjDt7vW4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784983484; a=rsa-sha256; cv=none; b=EKhOQyGjZwQFSX0HTujloaKbpimHvqIyjAMF2AxctT6Zx9Xyr9qpATrqVlDYRbdkJhTvBG RfLFSuyvLdLRDPQ9NaAAgSMEt4DdQEwI1MNqcVQsxN2vvvqXanZiejyc9ryedDY2GsXcSD cToBiQ6zKO+oEwzjUdVIzQjz/gMZzPcukgkpdT5DagJ+FgkElRrLFz4ak/MHYkNQHea+zV BqyfD5Ho8Lc4HNLRuCj8GZIn8olHUpKuZLb4Fp4uF1ozfkMKHJbcLsvCjEybyyaLHCCy1Q 5jr17dBQRdVzhvVmi1ydHOgdDYCj5BBR5Wz25Qrt2rvNg2Xo6Uj04AanBDKegg== 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=1784983484; 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=uZ8pVHcePL0r+FUXH0hNeAx22JX4R1yRTIsbtbWalh4=; b=H3+h1KjbVGkOdIX70eo1jeOhARG2ltIDmbAczIeJu3zN1MLDRPG6i7Q7IYV8/R7o8X5yi2 uMkmXEbZmPNkzN05je+aYET3rzP29qP1eoh45rzvSR/RuIgODu10wPAzNT6LSX6EqKjdQ+ ZBNR2MTj08rcASfw8zcxQpGsKAIM8GvlPlqg3Voup/4Sf7/bNmkAcvT+xw8NiRZnT9fCSx MNJ0Ko5YSi9OVKn+jyXHXWs6TRYSvkcpSHi1FC9aZKLbWHtMqBWE4pmGuaXOpe/0AWvBP/ W4tzdFR35oQiEO/iH8io9UINtvUMFrWfA2H55nFxV2lOP/4u3YkxV3Vk+X+U3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6l1R5PyFzdYc for ; Sat, 25 Jul 2026 12:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 248ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 12:44:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5922e9d7e72b - main - pwait: Don't use init as a target List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5922e9d7e72bfa8a85b0f37bcfd1a8b5d866ec3b Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 12:44:43 +0000 Message-Id: <6a64afbb.248ac.412a55c0@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5922e9d7e72bfa8a85b0f37bcfd1a8b5d866ec3b commit 5922e9d7e72bfa8a85b0f37bcfd1a8b5d866ec3b Author: Dag-Erling Smørgrav AuthorDate: 2026-07-25 12:44:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-25 12:44:35 +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 --- 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