Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 05 Dec 2025 19:30:31 +0000
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: bc14dcd113ae - main - tests/if_bridge: mark several tests as requring vlan(4) or gif(4)
Message-ID:  <693332d7.26e9b.516b6229@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by glebius:

URL: https://cgit.FreeBSD.org/src/commit/?id=bc14dcd113ae49b778b14d7bc446d57e96f40365

commit bc14dcd113ae49b778b14d7bc446d57e96f40365
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2025-12-05 19:29:43 +0000
Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2025-12-05 19:29:43 +0000

    tests/if_bridge: mark several tests as requring vlan(4) or gif(4)
    
    This makes them "skip" instead of "fail" if the module is not present.
---
 tests/sys/net/if_bridge_test.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh
index b3405fd978c8..4b9293514176 100755
--- a/tests/sys/net/if_bridge_test.sh
+++ b/tests/sys/net/if_bridge_test.sh
@@ -145,6 +145,7 @@ stp_vlan_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	epair_one=$(vnet_mkepair)
 	epair_two=$(vnet_mkepair)
@@ -538,6 +539,7 @@ gif_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req gif
 
 	epair=$(vnet_mkepair)
 
@@ -642,6 +644,7 @@ mtu_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req gif
 
 	epair=$(vnet_mkepair)
 	gif=$(ifconfig gif create)
@@ -704,6 +707,7 @@ vlan_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	vid=1
 
@@ -880,6 +884,7 @@ member_ifaddrs_vlan_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	epone=$(vnet_mkepair)
 	eptwo=$(vnet_mkepair)
@@ -1008,6 +1013,7 @@ vlan_pvid_tagged_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	epone=$(vnet_mkepair)
 	eptwo=$(vnet_mkepair)
@@ -1052,6 +1058,7 @@ vlan_pvid_1q_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	epone=$(vnet_mkepair)
 	eptwo=$(vnet_mkepair)
@@ -1099,6 +1106,7 @@ vlan_filtering_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	epone=$(vnet_mkepair)
 	eptwo=$(vnet_mkepair)
@@ -1229,6 +1237,7 @@ vlan_svi_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	epone=$(vnet_mkepair)
 
@@ -1270,6 +1279,7 @@ vlan_qinq_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	epone=$(vnet_mkepair)
 	eptwo=$(vnet_mkepair)
@@ -1335,6 +1345,7 @@ bridge_svi_in_bridge_body()
 {
 	vnet_init
 	vnet_init_bridge
+	_vnet_check_req vlan
 
 	bridge=$(vnet_mkbridge)
 	atf_check -s exit:0 ifconfig ${bridge}.1 create


help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693332d7.26e9b.516b6229>