From nobody Fri Apr 18 15:45:20 2025 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 4ZfJxY0V5bz5t0C2; Fri, 18 Apr 2025 15:45:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfJxX3TT6z43kH; Fri, 18 Apr 2025 15:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744991120; 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=nqUVOaa6v7xc/4HlmNpBih1oZv4DtljtvsaVSySWTYo=; b=OKAg0tGy2FIywT+/SrfHfv7cu9fjKRhCTOFZmN69lR59JQfoQFvBQ/K6rYNfdDg8ZXBEMh 94YBr6egovtg2WbjwEuOQx+NDLvc8mK+e5BrUSUt3YfTrQ9BzU5us2tJ6i8JP3gMlYLIe8 GL6rlvW2zEEydTex/TpsjqwkPhWzM1qGvpky0H6tp2DN80jH9ceCMfsrU7ZUKU5Bq4y5EQ 2b8TiQnrI3RVeV6jH+dNdoC9i+d47oOjgFha4a2gmGeAvmbyuHS8s5izDr1Ws6OsGn77xJ Uvnb+UdYChyrKHCSCrXVBFUGkd4D0aXXNdiArP3KruxCeC7RY2MkEUFz2IUOQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744991120; a=rsa-sha256; cv=none; b=srvbcRIJyU3mPyJmZ796sSm6nGQDmPulyk1ahat49Wb4hGK2EGeCF3+lpZ0Get0PVbqxDf +ayY8g1w2tJYuSk19mfXozqz3odzvBXk0160zYY7sH2nevRGc2bXPwDajk7F4r0CJzLkk8 UAX7BRbM4+oyvFrU3E/CPhWOpwBuzhOQjasazD/4FVjojqybSnz5XuYVBsG/nd62h38zAC FPTKPXkcTWR06dqAqgJe500WWk/g7D6V9RG/BLm54THTYZDfA/aAmUvg4rkmkSILE0iq9K BAeE7J7xHW6MKaXnicv/J6cqKyIJ8TZow8sJ26xBBjFWdTCLGumanxjBf2RXjw== 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=1744991120; 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=nqUVOaa6v7xc/4HlmNpBih1oZv4DtljtvsaVSySWTYo=; b=d8jQTEL59Wn5/Gwjelrh540BKwYfl/2xJjM4S7vrU5DOc0Su99fmv+KGm0lEp3ZVlA0SH4 RC6yW/mVAPh18r6U21Kmk0zl9ZCOEKrM/UES3PJkqmdepzvcHGXmGJ5n+XzpTDRMv2Lxdr nyYst2IyStPAGp25JeytDwGT1ytYOGnPFeYjpey+rdrru25tNuw4kzghtwXwb4FtZ1cdPM DexyYfvfJchQjHvCOQt0nMGIvv6DJ7CUWiGEBBbUZyZepL4Cc22qKttt02ARtFPlw/j0nJ pj7kvnKVTMaGEd0JS2GkNmfl2xj2T0Vg6Xr0BLXeSDh7JzbRYh2firo1gncBFw== 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 4ZfJxX33b3zgkL; Fri, 18 Apr 2025 15:45:20 +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 53IFjKeC023843; Fri, 18 Apr 2025 15:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IFjKrV023840; Fri, 18 Apr 2025 15:45:20 GMT (envelope-from git) Date: Fri, 18 Apr 2025 15:45:20 GMT Message-Id: <202504181545.53IFjKrV023840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 987ef153c288 - main - pwait tests: Fix some exit annotations 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 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/main X-Git-Reftype: branch X-Git-Commit: 987ef153c28878c3968420663f6061d6e70540a8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=987ef153c28878c3968420663f6061d6e70540a8 commit 987ef153c28878c3968420663f6061d6e70540a8 Author: Mark Johnston AuthorDate: 2025-04-18 15:35:18 +0000 Commit: Mark Johnston CommitDate: 2025-04-18 15:44:15 +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 --- 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