From nobody Fri May 2 16:14:45 2025 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 4Zpwx14szDz5tg3J; Fri, 02 May 2025 16:14:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zpwx14CY2z3y0G; Fri, 02 May 2025 16:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746202485; 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=WpoWNSdUJdb1ooekWPavzFUvfh2aqaX5Vsed7+B5SCA=; b=CB3u998S6tuxvzxn5OktENvkOVfZND3e+LPzy3nYDzYbHlJjOrM8zb9hMGpkpQ0tr34Xd4 zG3CyR5nQPTPYiK28xny3MXJ1AoRbcLAjPw1bisGbrG82ydu/7oi2T4xevcOzLKYMR5QoL HldklZM8hIvZw0oAhD6LLHxZvZb+eVvy4uv3XQPE349fP2bWCXVC/tSyhyhtgLwaJATLrh T86i/Jm4W4W+yPQfs7wLvYaVat8mFH4CKZTOlx3xe6+3lx4XSA7Ad/NUDpz/4Mph2RfwZc aRye7IyjxbuHx+ElVBGHpIMOWKHrJ+hNAy+3TLTqacYOpfRtmbSnPm0RlbvXcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746202485; 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=WpoWNSdUJdb1ooekWPavzFUvfh2aqaX5Vsed7+B5SCA=; b=xrcwdTnCbXrrmxImS9IuYnacNBKE3Zg8YEEcYge6XH2+07BVvjQsPTzGi+0r98n7WRpPlc /oGdeRTzgy826R8cHq8uZgWWIPlNlPTC86NqQ9mWzwPqGadVgynZZHbVYntHBcU7fs1hE0 sjTiTGTdX4tpDXnWGVfXR+/cV+uJvFBZs5cMu2vz1g5/iO0jSxb0wJLYEjSsoW0wzz22RG ohtfBNuxXbv46LDAmuPfff7FTDwq2+MZH5iymOEJ6XD8BSvmxWFFkhFIcFYS5q0oIzsGHf 3iHFNr56UMMvGgOE6iZTX98YCnIeqo0wxRvNs4sMyZS3p+qCy5GG/PaOHOEhhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746202485; a=rsa-sha256; cv=none; b=BwYQ/Fu38m+CnL+N0zDCThuZb/ApM6aINSY637MgkdxZxx6zyqQTw467KlsEnswwH0oKln zUYfcXFPiqcgvbQmRDr5AeCQcmXip8Y6Q1TQKo2F7U/j9QyFqHWU+URa1aWONqKyl7+wT8 WpzVyvQxjrBZ08jxuyrqPhCDwfDosuQxGAE48kZjBd2kFPEYvDoCj/h7JcD7BHw8KmDILF ASOo5hqlDBKx9vgJKB8+lbh2u3b0JMXO+n1aGCAmxNxePtdFNeYoT/ODBlNgoc+tKh1OtI oGgHKkUuxkKrbXm+f9ibmv0YMz68MNPEbSc/g8CIwgHTtFsJMS/Qc9RLILKo0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zpwx13h6sz1JZG; Fri, 02 May 2025 16:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 542GEjmJ054425; Fri, 2 May 2025 16:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542GEjx7054422; Fri, 2 May 2025 16:14:45 GMT (envelope-from git) Date: Fri, 2 May 2025 16:14:45 GMT Message-Id: <202505021614.542GEjx7054422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 03f0c1b18193 - stable/14 - pwait tests: Fix some exit annotations 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03f0c1b181930c46d1839f20953a0168683fe9d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=03f0c1b181930c46d1839f20953a0168683fe9d4 commit 03f0c1b181930c46d1839f20953a0168683fe9d4 Author: Mark Johnston AuthorDate: 2025-04-18 15:35:18 +0000 Commit: Mark Johnston CommitDate: 2025-05-02 16:14:35 +0000 pwait tests: Fix some exit annotations A number of tests rely on timeout(1) to kill a pwait instance, and with --preserve-status the corresponding exit status is propagated to atf_check. Update the checks to reflect this. MFC after: 2 weeks (cherry picked from commit 987ef153c28878c3968420663f6061d6e70540a8) --- bin/pwait/tests/pwait_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/pwait/tests/pwait_test.sh b/bin/pwait/tests/pwait_test.sh index a726c467f57e..66bdd6981704 100644 --- a/bin/pwait/tests/pwait_test.sh +++ b/bin/pwait/tests/pwait_test.sh @@ -87,37 +87,37 @@ time_unit_body() atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 100000000 $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1h $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1.5h $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1m $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 1.5m $init atf_check \ -o empty \ -e empty \ - -s exit:143 \ + -s signal:15 \ timeout --preserve-status 2 pwait -t 0 $init # The rest are fast enough that pwait -t is expected to trigger