From nobody Sun Dec 15 04:40:27 2024 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 4Y9r3c12Djz5hGDX; Sun, 15 Dec 2024 04:40:28 +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 4Y9r3b6xP9z42S5; Sun, 15 Dec 2024 04:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734237628; 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=zPtvpKjswL/qvoVuuwskPFWCnJF3ca1ojWNYUgDgqzs=; b=DR/By7vqH8LdnmFiaHOZJ4DaaObVRGaRShlKn6lWJTK3XPTpba4286Fj0fyH578B1Yx8UM MW5mAgytmFQ1wTxdRUDH9u1WcV2/DY6OfKe0KM1jb7nN+cSR/OXcEgCpMVuvxnq4BVwoIi JI7nIPZqme/EMMi93SQY896hfHbgg8FX1NcLriKvpNZzzqbPQRTHYQJ87YiaGXR6skQt+o rDbD5+9UdXiM/qW6kaAXZkgw7B2PmoEk2drTbCYh9nnRUjm9HGNcSM65bGWKYN4RHQSJFj QD6BZEwLxRxyPW6i8wAxI60KYp48AulX3BWbwF8jBldGu6D2T+6iKFrLMazxvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734237628; 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=zPtvpKjswL/qvoVuuwskPFWCnJF3ca1ojWNYUgDgqzs=; b=ZJyVEziD6930pXJCkABYu7RLMC6pTV01BPU96Ts5PbmmCmuDPtoIMQ6dQn/h6WiZHWmtdT QK4SI7BBsClUW1vptc9R0/fWIcgMvUrE+X9/3pz9dkvr63f8JmPO2pRnywCmyk/nPePh6g ijAtG3b8fajJguwWXPF6LCTwlWrYU34lp01p9+zbGFNc307bKvPVv/aUmJ7hgRQIuC6R8e Nu/2ohMsK/mpvDd6CSta8JXmkDJBTY2TIrKq2Jldb6vUauRjqJLIrRUrTqw8j5+gJSlu+B 9yTxCHzx0BigaZ0GqiFjKN2SDqShobWW+xYdYbsRoSaY/zHziA/TpgCx8LopYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734237628; a=rsa-sha256; cv=none; b=mBySXU8KC4Z+ZevYpVG5rGTkQupt23SsBYo3wR6WsDz2vq5DL6CNxSWupl/RKx/vEK9S3u 3ui+JSrjemp4GXNWVEX5ay3jW3I67gqS6YCf/4J88U2/YSA5WTKnlWCHs8tKruSwn3+NZj SX6jxbd4r3VTyuGKYZo16HV6FGThm7CEwGQeyB5Qi6EsP537fADNhgZZAJ6yQn+z2nMwp6 +JUwT8PSwJRRdVC/CLN2E9cr6gSqYPcaPO/QJNNVHhjb/KkpWjPOp4xxTwhKyKrc+pHnFL NxU5baF4TaV2Tc0qR9u9P7AApGcRJZe4O/ZSO6SyYfjMSZzMuqdgQaVoIdsrLQ== 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 4Y9r3b6XYXzsvR; Sun, 15 Dec 2024 04:40:27 +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 4BF4eRZB040224; Sun, 15 Dec 2024 04:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF4eRcW040221; Sun, 15 Dec 2024 04:40:27 GMT (envelope-from git) Date: Sun, 15 Dec 2024 04:40:27 GMT Message-Id: <202412150440.4BF4eRcW040221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 1a2a0db0a9ec - main - tests: kern: improve logsigexit test 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a2a0db0a9ecf0f761eadbfe81289515a7efa5f0 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1a2a0db0a9ecf0f761eadbfe81289515a7efa5f0 commit 1a2a0db0a9ecf0f761eadbfe81289515a7efa5f0 Author: Kyle Evans AuthorDate: 2024-12-15 04:40:15 +0000 Commit: Kyle Evans CommitDate: 2024-12-15 04:40:15 +0000 tests: kern: improve logsigexit test Use dmesg(8) instead rather than relying on a particular syslogd configuration, and just skip the test if we can't access the msgbuf. While we're here, remove some debugging output that we don't actually need. --- tests/sys/kern/logsigexit_test.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/logsigexit_test.sh b/tests/sys/kern/logsigexit_test.sh index c40c033bbefd..f0db02613533 100644 --- a/tests/sys/kern/logsigexit_test.sh +++ b/tests/sys/kern/logsigexit_test.sh @@ -8,6 +8,10 @@ atf_test_case basic basic_body() { + if ! dmesg >/dev/null 2>&1; then + atf_skip "No dmesg(8) access" + fi + # SIGABRT carefully chosen to avoid issues when run under Kyua. No # matter the value of the global kern.logsigexit, these should force # the messages as appropriate and we'll all be happy. @@ -22,12 +26,9 @@ basic_body() read enpid < enabled.out read dispid < disabled.out - 1>&2 echo "$enpid" - 1>&2 echo "$dispid" - - atf_check grep -Eq "$enpid.+exited on signal" /var/log/messages - atf_check -s not-exit:0 \ - grep -Eq "$dispid.+exited on signal" /var/log/messages + atf_check -o save:dmesg.out dmesg + atf_check grep -Eq "$enpid.+exited on signal" dmesg.out + atf_check -s not-exit:0 grep -Eq "$dispid.+exited on signal" dmesg.out } atf_init_test_cases()