Date: Sun, 26 Apr 2026 01:56:22 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: bea17411473b - main - tests/ipfw: Make tests run more reliably in parallel Message-ID: <69ed70c6.26bea.502b248@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bea17411473bc58608badd425c223ee59d40a465 commit bea17411473bc58608badd425c223ee59d40a465 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-04-26 00:33:45 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ed70c6.26bea.502b248>