From nobody Wed Feb 12 19:39:13 2025 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 4YtTCR6phzz5nGmr; Wed, 12 Feb 2025 19:39: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtTCP4WXBz3XyN; Wed, 12 Feb 2025 19:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389153; 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=gTgEyKUsj6JtThyyqY8karKjHoQ6M7zPmnEqz/QCrI8=; b=OLQ3aSFZcs1MlBScAXN9Nfzfi5Az2q+WVmZUqgAtOwRGF/d5hc1CfHBNnARk+AP/GqhBpI IpanC9QnObOUZ53mvekZEhZU7qwbRRmORHytp0CBW3KyrpVcvWouEAiDVAYrk4MzZi6MnX itokHKOb35h32jEgHyIPrXAqfDD4tk4rTi22VIZ0OnbiUZC080yMQeXEL+zaUpenDUoz2d U/tNMq4lVYuGX1oRL0U2Obj4WYyAM1FD+RrFHJJTNDfuBKLn5ADOFatTa6WTnnzKlzXZjv UD3/Np3A8CJSrtEk7c579hT3IxaXSJE2dGpfk5MQ8R8Xqwyaz+c0feSycxSPTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389153; 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=gTgEyKUsj6JtThyyqY8karKjHoQ6M7zPmnEqz/QCrI8=; b=cQehRswzxU0cSaVB8WgNFpbWuuE207ljNS5Tte/UxcpqA6nEd2X7XJVjws5dBuUM9sZLyG iSYBxLCUjEPyrCWuMopHXF1q4i3Qk6hdRdumP7ue/XsTcUBYxyqBnnbwbB+7tUzhuYU7T4 pG25wwt6lJSkRrI3lpsRIGn7CoCmaOW8HEf0+bwvi620niSr39qUFXQBou3LWvA5/LRNi3 EbyZJcd6Hro9ZBiCIgf9mz3tIlLHaowqj9TJURiCTGoYJneIW+9Xb8J5L4/Bnlh2/Z4axq lxcSP1Qt4Zxh1wlsLG4JuGDzAcMl0J7osnn+N3f2CC0yyfzVSPrvEx37Utvpag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739389153; a=rsa-sha256; cv=none; b=Ig53nQ1tx1G4sz58kFEjERCpcVb3JT8Xus/ivefSl0RpppYbmwO33XPuWwmi7Kb9YOD/+a /THlkHfaJFv+nAbOTp0inkCxfC5Wx7T1RMx2m3ISYFDeMcb4WcZvea4KFtfzOxdihoG5MY DuVsijiO1SvWYzjmpf0Kd/gYnylyIVuva6k3DyAFnCOioZwNOPw7Uq/LwKWuUKuYRtc1SH bOspTY3jdXcXcFtbYNjfbH81FsFUpIKVbRrGDOx4cP4ohIpspGRl0RXPOP6AQWar2hBDwP yJlk1Rzu7/z1/s4gYvlKpHWPPMiE6Hb7HnuhZ/4LEZogU5F0qCMHGYkFAxdeSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtTCP40fLz1BWr; Wed, 12 Feb 2025 19:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CJdDqi061848; Wed, 12 Feb 2025 19:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJdDcD061845; Wed, 12 Feb 2025 19:39:13 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:39:13 GMT Message-Id: <202502121939.51CJdDcD061845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: e736f6df1ec1 - main - pf tests: fix test skipping when pf is not loaded 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e736f6df1ec1d2f5a846a20cec8744cf843daf78 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e736f6df1ec1d2f5a846a20cec8744cf843daf78 commit e736f6df1ec1d2f5a846a20cec8744cf843daf78 Author: Kristof Provost AuthorDate: 2025-02-12 17:38:30 +0000 Commit: Kristof Provost CommitDate: 2025-02-12 19:38:39 +0000 pf tests: fix test skipping when pf is not loaded Two test cases in table.sh didn't call pft_init and thus didn't skip if pf is not loaded. The fragmentation_pass:v6_route_to test had the test body in the cleanup function, so got run even when pf was not loaded. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/fragmentation_pass.sh | 10 +++++----- tests/sys/netpfil/pf/table.sh | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/sys/netpfil/pf/fragmentation_pass.sh b/tests/sys/netpfil/pf/fragmentation_pass.sh index e72b065b77bb..9255e6f738cf 100644 --- a/tests/sys/netpfil/pf/fragmentation_pass.sh +++ b/tests/sys/netpfil/pf/fragmentation_pass.sh @@ -165,11 +165,6 @@ v6_route_to_head() v6_route_to_body() { pft_init -} - -v6_route_to_cleanup() -{ - pft_cleanup epair_send=$(vnet_mkepair) epair_link=$(vnet_mkepair) @@ -224,6 +219,11 @@ v6_route_to_cleanup() ping -6 -c 1 -b 70000 -s 65000 2001:db8:43::3 } +v6_route_to_cleanup() +{ + pft_cleanup +} + atf_test_case "mtu_diff" "cleanup" mtu_diff_head() { diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 3b7e116720f3..a3d00f8cdb14 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -172,6 +172,8 @@ ctime_to_unixtime() zero_one_body() { + pft_init + epair_send=$(vnet_mkepair) ifconfig ${epair_send}a 192.0.2.1/24 up ifconfig ${epair_send}a inet alias 192.0.2.3/24 @@ -243,6 +245,8 @@ reset_nonzero_head() reset_nonzero_body() { + pft_init + epair_send=$(vnet_mkepair) ifconfig ${epair_send}a 192.0.2.1/24 up ifconfig ${epair_send}a inet alias 192.0.2.3/24