From nobody Wed Sep 09 08:35:26 2026 X-Original-To: dev-commits-src-branches@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 4hfvJb2Dm4z6rhrH for ; Wed, 09 Sep 2026 08:35:27 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hfvJZ6Nmyz4Nqf for ; Wed, 09 Sep 2026 08:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788942926; 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=RrzJ4Xb56TluvtQ+kaZl6FNecbXOMjQvSlAS0u0nrSg=; b=AyYmqQFHPcdk7hmfmKvV7vmnQgXhiVfEpokY63YedkKgPSq/mA8RP+s90WJoCg8NkiSH1S ST5Nq5KNs9wo+Whjk85MQroLYqrH+ZtzCOYWgtuJ6RrwS5WSqXXikeXlSzU1Cc8s/l4H5b y0vyDKKvKHamBSN6hCgdCZ7MKc33wVY/zfhL64WIGqyvLxM7xq/vof4U8A+FCEFJCzmJ8Q 3npL+uhS8HSDBNui/zfXgQf1N8fQ/YdqzGcFz4tye/5td4pwIOw+jlqxD2gJDAytBk5ex+ Fmyt8B5kuc1oWIgXHzp3k8Q4vum4brUAiCLgywsBxrMeKHukZk8dtFkUVo3blA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1788942926; b=ZKE55sljOlOme9Wm5cXSWppg+XE1GrI0WE10riJm2EqhDvKkyzXMnMCqRtPCOPKQFNTDuQ 7+P7ulRVK+C+qBgbOz11TyjTM8YrgJuAccC5xpkq7W1uYV4DSa3sFCcwgcgW32597u3Edg pmBvwVooFjTT+XOL9MRpwa/YKUqXn2R9oqgCBdsXq28w31c14ZdHGUiDgnRVjhdlU+8Bhv d085ySv8zUVc3IcIs7IyP0Ni1Qz/Tj278DvIGS8PUVWmGXvUQWkDOvjZLwVzEgemLWHjMS aaX+07BV7nkP2ZoGHGN8MXnh+AxxEYqSvDcznrWstefoIy+/VFNU50wIIs+IKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788942926; 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=RrzJ4Xb56TluvtQ+kaZl6FNecbXOMjQvSlAS0u0nrSg=; b=ofetxAlugPZx2f12SFATQy7GJALc1pQObhyeRoseMXxstW7t1zEiItNDdFA0FTYdDuYIdG x4A6C0zspGQA351XrUZluuNYyhHJyxPPLKOHJFmHmBLDdtOsS4zgwAE1XUyUoa9E4dIw8p EZCZ8NDME/VRDTJp6efA4ZflgDl4IfYbYlZixduOHe8xKeXcYx9ExUnaqO1bHYlc+N5xgT C6o9keLJDEjBsLGiMOQgedwZLd7zdQ6zIjim16lz4yar5npobqUZanAQbA1xx2t/qYgvbw ooB+QpP27RzMcy/kir9OZmGw+eGVA439Gj1YMCNCjejikgzAIGvrQTizMhiytg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hfvJZ5ShDzqFS for ; Wed, 09 Sep 2026 08:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bcf2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 09 Sep 2026 08:35:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 74c5995d2e8d - stable/15 - syslogd/tests: Amend a test to catch leaked process descriptors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 74c5995d2e8d8639fdc723561f06a82ab86ee9c4 Auto-Submitted: auto-generated Date: Wed, 09 Sep 2026 08:35:26 +0000 Message-Id: <6aa11a4e.1bcf2.6b468999@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74c5995d2e8d8639fdc723561f06a82ab86ee9c4 commit 74c5995d2e8d8639fdc723561f06a82ab86ee9c4 Author: Mark Johnston AuthorDate: 2026-09-02 14:33:37 +0000 Commit: Mark Johnston CommitDate: 2026-09-09 08:34:33 +0000 syslogd/tests: Amend a test to catch leaked process descriptors This serves to catch the regression fixed by commit 1a669b66ddb4 ("syslogd: reap pipe children on config reload"). MFC after: 1 week (cherry picked from commit 231dfc99a08874c269593c2e491ce16a618f4ed6) --- usr.sbin/syslogd/tests/syslogd_test.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index d17152f69bfc..0fba9b910a17 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -335,6 +335,7 @@ pipe_action_reload_head() pipe_action_reload_body() { local pipecmd="${PWD}/pipe_cmd.sh" + local pid cat <<__EOF__ > "${pipecmd}" #!/bin/sh @@ -351,15 +352,21 @@ __EOF__ syslogd_start syslogd_log -p user.debug -t "pipe" -h "${SYSLOGD_LOCAL_SOCKET}" "MSG" + sleep 0.1 + + pid=$(cat "${SYSLOGD_PIDFILE}") atf_check pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" sleep 0.1 syslogd_check_log_nopoll "END" + + atf_check -o not-match:"[[:space:]]P[[:space:]]" procstat files "${pid}" } pipe_action_reload_cleanup() { syslogd_stop } + atf_test_case "jail_noinet" "cleanup" jail_noinet_head() {