From nobody Tue Dec 30 13:17:14 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 4dgYXW12N5z6LvNk for ; Tue, 30 Dec 2025 13:17:15 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXV65rcz3TsX for ; Tue, 30 Dec 2025 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100634; 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=2CthdihQa1SgzRxOWtJ6R0nJ8unGVJhMhOkofCt+UmI=; b=xyg2lQmocbkYFkGvUnx7hhiG1szsCHOxTUKZzpzI2gCDPszKqifESDT0b/jpQx/1W+yHEH tsut8j5/PSYLC0hpPLiE+IOXOddU+Qtpz/fT2/s+kF/z5DAVF1HuM7p0z1KoAsgjeU0r8m EfiwS5B7WajHBsgTag1Clwv1Fz/AiMn4CYUXThhxJoeIOud8MDL+RfyfCFnI5+VOeqaQdm yulHfinRZZpM7t8NAamMxB8hHMqKJuqhbGrcH5zgmZ+HODjpukn3LN4nlSg8bvHZYpnN1K yPZYdGxisAWjXg0WnpXvRG2S+kw9pPEL+FB8LCAY8jZ3Ditu4f6MXvwjffE5Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100634; 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=2CthdihQa1SgzRxOWtJ6R0nJ8unGVJhMhOkofCt+UmI=; b=c0PdXE3mj1PKHjLRchAJHURB2ZpYjnEOpd+1eDC7sq8Z0ceO4g1jITI9mWSUIQz59FEyAL 0VWhO+11LPZcMAg09c12OZfOS8rHya+2YdoyG/u9bPedwd72iuzJI8ZrDE4TuI8MABna0/ zF9qdGwrIp26lh5IDvcGfd0BQR/a7UvcXlO+5ddIHyZjEfdX4trlT2OcUkSMXPU4nTcZLf poReGcgdVamNa9GpeEU8UiA1EH90frVR6BOjXrl9Jt0RV2ssrhYxjfLWfqc/5uKEmfANcK zYXMeB8DpgBhzz46La/8dkqMeXUzrrbVTy3GtvJoiR6mj5DJ69mLHV0fgCI4lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100634; a=rsa-sha256; cv=none; b=LvRfBdoVU87/jW/PKtSOt+d0hpL5nRM8SsjAM9nc/Mw7SHjNbFlLba1B2JwUYclsagoNMS bOAvJfYyDnPqG7krnvWSzGwEjw4+xVy4glB7MaipGAu1+YzvAaYMDPsLz1r5ClssNQR4W3 rKrGvSUFbsxYTmLSzXJU29sUbtHNIpUyBEUFL/TRHOM3dx+oBerf9NtwepKsYFjjTqJeAN oLbCf4PSp2tPFcwx4+gaMp1z0xHs1Vktsrwgr9q6SU5RfTRnp6TwT2MQi/eGVtcgZh3tJV VyGzOWhihLRxDQBvXGBGUGu8dGYnG0nNZdDkDPx3kEX669Rz5wqgfIwq5gZOBg== 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 4dgYXV51KDz123b for ; Tue, 30 Dec 2025 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c163 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2eec2bcca297 - main - pf tests: avoid cleanup failures on skipped tests 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2eec2bcca2972b58fb8e9acb65c208af423f2181 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:14 +0000 Message-Id: <6953d0da.3c163.726cd9e1@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2eec2bcca2972b58fb8e9acb65c208af423f2181 commit 2eec2bcca2972b58fb8e9acb65c208af423f2181 Author: Kristof Provost AuthorDate: 2025-12-30 10:30:15 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:53 +0000 pf tests: avoid cleanup failures on skipped tests If we skip the nat:binat_* tests (e.g. because pf.ko isn't loaded) the inetd_tester.pid file isn't created. We still run the cleanup function, which tries to use this file to clean up the test environment. This results in 'broken: Test case cleanup did not terminate successfully'. Avoid this by checking if the pid file exists before using it. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/nat.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 3d953b495953..025471f75f97 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -804,8 +804,8 @@ binat_compat_body() binat_compat_cleanup() { + [ -f ${PWD}/inetd_tester.pid ] && kill $(cat ${PWD}/inetd_tester.pid) pft_cleanup - kill $(cat ${PWD}/inetd_tester.pid) } atf_test_case "binat_match" "cleanup" @@ -872,8 +872,8 @@ binat_match_body() binat_match_cleanup() { + [ -f ${PWD}/inetd_tester.pid ] && kill $(cat ${PWD}/inetd_tester.pid) pft_cleanup - kill $(cat ${PWD}/inetd_tester.pid) } atf_test_case "empty_pool" "cleanup"