From owner-dev-commits-src-all@freebsd.org Sat Sep 4 12:28:17 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 73D86661F5F; Sat, 4 Sep 2021 12:28:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H1v8K2dKpz3wTv; Sat, 4 Sep 2021 12:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2509B17E02; Sat, 4 Sep 2021 12:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 184CSHn0039753; Sat, 4 Sep 2021 12:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 184CSHOB039752; Sat, 4 Sep 2021 12:28:17 GMT (envelope-from git) Date: Sat, 4 Sep 2021 12:28:17 GMT Message-Id: <202109041228.184CSHOB039752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 910a898f1722 - stable/12 - pf tests: altq:codel_bridge requires if_bridge 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 910a898f172284a9a646919f63efca2e45ae5146 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Sep 2021 12:28:17 -0000 The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=910a898f172284a9a646919f63efca2e45ae5146 commit 910a898f172284a9a646919f63efca2e45ae5146 Author: Kristof Provost AuthorDate: 2021-09-01 14:09:14 +0000 Commit: Kristof Provost CommitDate: 2021-09-04 12:26:15 +0000 pf tests: altq:codel_bridge requires if_bridge Check that the bridge module is loaded before running this test. It likely will be (as a result of running the bridge tests), but if it's not we'll get spurious failures. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit d491b42535db50693eac5946557f7527f9903b4b) --- tests/sys/netpfil/pf/altq.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netpfil/pf/altq.sh b/tests/sys/netpfil/pf/altq.sh index 2b5b1828595f..0ced82a3a942 100644 --- a/tests/sys/netpfil/pf/altq.sh +++ b/tests/sys/netpfil/pf/altq.sh @@ -156,6 +156,9 @@ codel_bridge_body() { altq_init is_altq_supported codel + if ! kldstat -q -m if_bridge; then + atf_skip "This test requires if_bridge" + fi epair=$(vnet_mkepair) ifconfig ${epair}a 192.0.2.1/24 up