From nobody Sat Jul 25 12:44:43 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 4h6l1Y2K6bz6lLtV for ; Sat, 25 Jul 2026 12:44:49 +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 4h6l1Y0GPYz3hBk for ; Sat, 25 Jul 2026 12:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784983489; 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=WW10IQaUA/2zGjBdsnwSMCKSuP1EaG6shF3kYFpD5uNMXbBMHx+PN5kz3oksaPUq20nJCi 3Cnfm8n5O9TGhgBY5BAUoSdL0vEIf2XF68oHFRg3DdptCDAICNzJf06wLWVz1igQ0czdNG 0kNY5qKqPJXeDL0k92YDJJaMYJTpukyrAQJQcS1JpPcJh26zlJved1S2nkh8f/P5ABT0dJ yl+tiudREFB6GG+iGsqpEI27A7X68PEcJQTfIZSwRlWCWQdiM3t9ILeUHes5jdpsJ2W22z mW0FpIPlseDil413nsoCm9Yg6znONPC3NeUFRZXU8OnYK+dUUB3ni0DSlk2/FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784983489; a=rsa-sha256; cv=none; b=d10T1l5mGxcyMjJZ9r8zfd3U2PC21CbVP6isjz9pzNtNu0/M63CcHh3Nci1ca8G+WGWtys tGT2tcH1ybnLOTP+cjIfd8J1viRHl5erMWY2sSQ6hQ6eZYZZ7uQSIXlA2zqhP9ml4/MSa8 6t0Aypwh62bsXsYs4o57KIoxVFeSoikBpdGS996WBe3DT3YcOtCr02abpIfr6XYfRCaUtR nWJOSTBhex/vUSdnmk4ZXgaVYxHII6fIhmsF7ZffU2WjE1WLHYf7ksrm3s5jBZDTS6zR+s VBottiT30rA1NqeVd02FZt/dSCYqx0HCFhB4IYAkVAH116lNlk+vMDtzKUndJg== 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=1784983489; 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=PqYUVQQZeEnF+xpQZjIZBitZ20iTGTzK2RTgGNWB/FBXS3eDS2cBNHe8MKZGEkdaXZ8s+k /wSNV74AZ1PqS1/d892nkX4PHN2cNJ7M3gCELv3PY5lC9F1/by8bV5kz7QFeovHr8Aakdw s8VqdYpDLNKyg59XFRSLtZO9OKQ4bznmWayoKkF++9/IhWzMKzRUDkXOfjMYk7R3RHpvia GUKXUBaOD5CjOD9/r0UEf3/7xmjq7wqbVSRf03Iq8hQArfXP8rWucrfMhT4v5/gP3hTbBg DwZjkVLzi7B8U21T5hGbaGbAkmkEaJTCalLPdjhLrpEK3pjY8VwJGIKhb415Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6l1X5smzzd7h for ; Sat, 25 Jul 2026 12:44:48 +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 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: 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