Date: Fri, 2 May 2025 16:14:45 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 03f0c1b18193 - stable/14 - pwait tests: Fix some exit annotations Message-ID: <202505021614.542GEjx7054422@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=03f0c1b181930c46d1839f20953a0168683fe9d4 commit 03f0c1b181930c46d1839f20953a0168683fe9d4 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2025-04-18 15:35:18 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505021614.542GEjx7054422>