From nobody Sun May 3 15:45:52 2026 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 4g7pyn1BfDz6W32Q for ; Sun, 03 May 2026 15:45:53 +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 4g7pym4pK1z3JnD for ; Sun, 03 May 2026 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777823152; 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=kuJeD9W7sz4aZjGyv23keumHrZeoTIrn9EEkLU+lYHY=; b=lnH4b8gYSJaqQUlmvV7G6Ifp/HqDk6zMBUyPmE8v/Au/zMQRVXWP7qE5efPmd252KyRmsZ mNbTwq/J6N9ocK2TGmeK6LyunwPEZfZDwRyH64cKsY8IgiqZ7r4b0KyRz7xP9bZ9Ofcv5x San7u3c9U4GM7/dRk7ft96AJg6E/R5mcH31fMRAMWWX7ogGuIpRfqd75RrmJUDnacGKHK3 FzXX0VfIYu+laYMsO3XQIC13t/BJzcITNwQIi/YiO86m+QceKc+Grhvy2EW8H0NE7Pcw51 SPKKNzRo+3FQAhpTbLgS+z2c1FFvCJ1GyV+gTiqPXP91VjNqkwqrXK03YXe8aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777823152; a=rsa-sha256; cv=none; b=d9KcIRDwvbrQLAcuiWLbwNbrODCH7yFV4M7ANHx6e7tIoU1asVoZyFxk1KSiFA2DT2ZrRq e19qmTH4tPCXxiMO9huIsiRqxAy6WHgn9qDcX3xG3CRq+1hOv7CRLgKuWLwQb/Z4/vpHao WrCp+A1dARmah07F0lR6xiJAUUHCUvHzMGR3S0Y+DEjAw/lcJaReWj2exv809O+1U72OS4 3H7iqIrwT9ClG0n/XrUmYiMyOcL6XFn4gh5IrA5klZzv9bTidovmP87JwCAXq0tbJQ0uxR H3qWA3Tf3qExaBrUjUV0R6t3MEA1fbZideyoe27ifNC4u2Eij415mFoCOaqAoQ== 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=1777823152; 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=kuJeD9W7sz4aZjGyv23keumHrZeoTIrn9EEkLU+lYHY=; b=UL+lyGcOlnRXPtFlHWniwwlygC5v7N+3e+DdnZkWICxxFHQYg94LSzPaVN7TYp6seOBq66 IpikQL++XYN68FujJhqMJZObeFXpv0PTbf7i23OscGPLWuW1tOsbu17cKk3XmvNBDOycfU UYTOWPq50bFIewQdxxEnbr6OQoSL+eJNKqLyGQZcx8Yk+QWFzv8hPRs/X/LiLiMCHO9Qy+ dR8xkPwFKtacd4UF5l6y8xuRR1HbdGMDEc/krYzI/Ny0DLjDn4Z7yUmafCv3SCIoixjfRS f3dnl3YKsA4s7IghbPrwsWl+pBj2HlKv0azkBwLkouI+kv4LhvKjIp4lvIz7NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7pym4BHzzfrJ for ; Sun, 03 May 2026 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 15:45:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0cf4e7aa1761 - stable/15 - tests/ipfw: Make tests run more reliably in parallel 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 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: 0cf4e7aa17616cdccd0ff6026b813d95a01281f9 Auto-Submitted: auto-generated Date: Sun, 03 May 2026 15:45:52 +0000 Message-Id: <69f76db0.1ea42.7fe23a9c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0cf4e7aa17616cdccd0ff6026b813d95a01281f9 commit 0cf4e7aa17616cdccd0ff6026b813d95a01281f9 Author: Mark Johnston AuthorDate: 2026-04-26 00:33:45 +0000 Commit: Mark Johnston CommitDate: 2026-05-03 14:58:57 +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 (cherry picked from commit bea17411473bc58608badd425c223ee59d40a465) --- 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 }