From nobody Sun Apr 26 01:56:22 2026 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 4g38tt6ynWz6b85V for ; Sun, 26 Apr 2026 01:56:22 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g38tt5xzCz3QRC for ; Sun, 26 Apr 2026 01:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777168582; 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=08tAZOjTziNLC6MTzeYh2LcyXOZGgFjJDUDx0x3t3XY=; b=cFPIrJyDlz9szndrVSP2xdU7cHZkDq8hhL+O9YyUs+pE232L0Az4Uy9t07yHRtBC8KZ8c1 0moQFtzC0e8Duc4rIkhs0fvW5stXEtNAeJXpVib4MK+SIEuAXIkGb3BKWAx2S5TFRFzWH8 G7vKCaZ9l+eUym/3S3f85R9nATf91vbWGDLDXkEtmGsRIAV7d28ZlJp1ovLJ7KvOU7dx37 yEaSg0c5vJkwV6SctkyssKM+erIKIErkFr8ybaOiHYf+fg1Xlnh9sI94NsUEot2ibvc7jN L6ELul1/sx0FPqYTcuRqZ3rWXpWGJHlbpG5v+7xyov34Mq4eUpkQT7IsYNtfQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777168582; a=rsa-sha256; cv=none; b=e1fdhtny6wOa3pXW1jDp9b1EEvDptZrb7fyr4p+WZMQJD3g3RWhS72nPE6sR7/7HO7Wn0z SdexB5cdgwB1jhqFsIhXmb2G0TuDxJIh5K7oH/jiqyHwIkbFS9AdyHDDCiMNAVvhUCg4hs K+AwZ/35nlcHWlzQNVAvRYa3PWvUZcOx52sM3bsdaO5u6ui3dz0fUR2C4OhfJ4RY3jKZ8X 23YM9uD6JWxcCLCuJY8JbDU5D3Jo3nFn9E6hEJcFVP8KW5ShkkHoWFOlO+xbSWmvUnrlKq 4mdyTgY3SGd/1xIQ8pH837fDSTM8Xg4Dw+WzKtwHa4sbRn5s3rMjz3gNQGQ2wA== 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=1777168582; 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=08tAZOjTziNLC6MTzeYh2LcyXOZGgFjJDUDx0x3t3XY=; b=EAiRqgwb6LHWMUfBnxfYJMn+uVcFYVDBCo36BTQ0g2MREs8iB3v7WPjk2Zu9APMaN90xkR oc46NkDrlcmRCDfcelGL/81lXJEADLKG/BcL5srt+lm0QsxDyVRDAnyJ+9UImlNEqy7NWw spMozqnm5LLGwd3JtSxmfpXU7QmiY1ukWo91ggDrHPNMd/h7QteP6hKAbHb19Hj+k0Lqjf HJ4zsgGZFIrwoPw5ypPEzXcWBbdfEWs/ByVyv2R/C25/cOrpr+nah8T2IDihdggFQKFfxf jdoq7DgryU3+xnlDo1tAfejjkgw8X5IduNv7bUCHiW84EOuXHW1h1NLNR7XJaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g38tt5YB8z100b for ; Sun, 26 Apr 2026 01:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26bea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 01:56:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bea17411473b - main - tests/ipfw: Make tests run more reliably in parallel 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: bea17411473bc58608badd425c223ee59d40a465 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 01:56:22 +0000 Message-Id: <69ed70c6.26bea.502b248@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bea17411473bc58608badd425c223ee59d40a465 commit bea17411473bc58608badd425c223ee59d40a465 Author: Mark Johnston AuthorDate: 2026-04-26 00:33:45 +0000 Commit: Mark Johnston CommitDate: 2026-04-26 01:56:13 +0000 tests/ipfw: Make tests run more reliably in parallel - Don't use /dev/null as the pidfile for inetd, that doesn't work properly. Create a pidfile in the per-test scratch directory. - Use atf_check to validate results from setup commands. MFC after: 1 week --- tests/sys/netpfil/ipfw/fwd.sh | 14 +++++++------- tests/sys/netpfil/ipfw/lookup.sh | 17 ++++++++--------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/sys/netpfil/ipfw/fwd.sh b/tests/sys/netpfil/ipfw/fwd.sh index 9f7a6d48e12f..b7aa37795706 100755 --- a/tests/sys/netpfil/ipfw/fwd.sh +++ b/tests/sys/netpfil/ipfw/fwd.sh @@ -40,20 +40,20 @@ local_body() epair=$(vnet_mkepair) vnet_mkjail alcatraz ${epair}b - ifconfig ${epair}a 192.0.2.0/31 up - route add 192.0.2.3/32 192.0.2.1 + atf_check ifconfig ${epair}a 192.0.2.0/31 up + atf_check -o ignore route add 192.0.2.3/32 192.0.2.1 - jexec alcatraz ifconfig lo0 127.0.0.1/8 up - jexec alcatraz ifconfig ${epair}b 192.0.2.1/31 up - jexec alcatraz route add default 192.0.2.0 - jexec alcatraz /usr/sbin/inetd -p /dev/null $(atf_get_srcdir)/fwd_inetd.conf + atf_check jexec alcatraz ifconfig lo0 127.0.0.1/8 up + atf_check jexec alcatraz ifconfig ${epair}b 192.0.2.1/31 up + atf_check -o ignore jexec alcatraz route add default 192.0.2.0 + atf_check jexec alcatraz inetd -p $(pwd)/inetd.pid $(atf_get_srcdir)/fwd_inetd.conf firewall_config alcatraz ipfw ipfw \ "ipfw add 10 fwd 127.0.0.1,82 tcp from any to any dst-port 80 in via ${epair}b" \ "ipfw add 20 allow all from any to any" # Sanity check - atf_check -s exit:0 -o ignore ping -i .1 -c 3 -s 1200 192.0.2.1 + atf_check -o ignore ping -i .1 -c 3 -s 1200 192.0.2.1 reply=$(nc -nN 192.0.2.3 80 < /dev/null) atf_check [ "${reply}" = "GOOD 82" ] diff --git a/tests/sys/netpfil/ipfw/lookup.sh b/tests/sys/netpfil/ipfw/lookup.sh index c1f48dd7c99f..88bc4a07cfb4 100755 --- a/tests/sys/netpfil/ipfw/lookup.sh +++ b/tests/sys/netpfil/ipfw/lookup.sh @@ -36,17 +36,16 @@ setup_network_v4() { epair="$1" - ifconfig ${epair}a 192.0.2.0/31 up - ifconfig ${epair_recv}a up + atf_check ifconfig ${epair}a 192.0.2.0/31 up vnet_mkjail alcatraz ${epair}b - jexec alcatraz ifconfig ${epair}b 192.0.2.1/31 up + atf_check jexec alcatraz ifconfig ${epair}b 192.0.2.1/31 up - jexec alcatraz /usr/sbin/inetd -p /dev/null $(atf_get_srcdir)/lookup_inetd.conf + atf_check jexec alcatraz inetd -p $(pwd)/inetd.pid $(atf_get_srcdir)/lookup_inetd.conf # Sanity checks - atf_check -s exit:0 -o ignore ping -i .1 -c 3 -s 1200 192.0.2.1 + atf_check -o ignore ping -i .1 -c 3 -s 1200 192.0.2.1 atf_check -o "inline:GOOD 82\n" ${NC} 192.0.2.1 82 } @@ -122,16 +121,16 @@ setup_network_v6() { epair="$1" - ifconfig ${epair}a inet6 2001:db8:42::1/64 up no_dad -ifdisabled + atf_check ifconfig ${epair}a inet6 2001:db8:42::1/64 up no_dad -ifdisabled vnet_mkjail alcatraz ${epair}b - jexec alcatraz ifconfig ${epair}b inet6 2001:db8:42::2/64 up no_dad + atf_check jexec alcatraz ifconfig ${epair}b inet6 2001:db8:42::2/64 up no_dad - jexec alcatraz /usr/sbin/inetd -p /dev/null $(atf_get_srcdir)/lookup_inetd.conf + atf_check jexec alcatraz inetd -p $(pwd)/inetd.pid $(atf_get_srcdir)/lookup_inetd.conf # Sanity checks - atf_check -s exit:0 -o ignore ping6 -i .1 -c 3 -s 1200 2001:db8:42::2 + atf_check -o ignore ping6 -i .1 -c 3 -s 1200 2001:db8:42::2 atf_check -o "inline:GOOD 82\n" ${NC} 2001:db8:42::2 82 }