mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-02 22:54:52 +00:00
vnet tests: check for if_bridge.ko
A number of tests create a bridge, but did not check if if_bridge.ko is loaded. We usually get away with that, because `ifconfig bridge create` autoloads the module, but if we run the tests in a jail (e.g. because of kyua's upcoming execenv.jail.params feature) we can't load the module and these tests can fail. Check if the module is loaded, skip the test if it is not. Reviewed by: markj MFC after: 1 week Event: Kitchener-Waterloo Hackathon 202406 Differential Revision: https://reviews.freebsd.org/D45487
This commit is contained in:
parent
05704402ac
commit
480ad40553
|
@ -26,6 +26,13 @@ vnet_mkepair()
|
|||
echo ${ifname%a}
|
||||
}
|
||||
|
||||
vnet_init_bridge()
|
||||
{
|
||||
if ! kldstat -q -m if_bridge; then
|
||||
atf_skip "This test requires if_bridge"
|
||||
fi
|
||||
}
|
||||
|
||||
vnet_mkbridge()
|
||||
{
|
||||
ifname=$(ifconfig bridge create)
|
||||
|
|
|
@ -39,6 +39,7 @@ bridge_transmit_ipv4_unicast_head()
|
|||
bridge_transmit_ipv4_unicast_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair_alcatraz=$(vnet_mkepair)
|
||||
epair_singsing=$(vnet_mkepair)
|
||||
|
@ -76,6 +77,7 @@ stp_head()
|
|||
stp_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair_one=$(vnet_mkepair)
|
||||
epair_two=$(vnet_mkepair)
|
||||
|
@ -142,6 +144,7 @@ stp_vlan_head()
|
|||
stp_vlan_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair_one=$(vnet_mkepair)
|
||||
epair_two=$(vnet_mkepair)
|
||||
|
@ -216,6 +219,7 @@ static_head()
|
|||
static_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair=$(vnet_mkepair)
|
||||
bridge=$(vnet_mkbridge)
|
||||
|
@ -273,6 +277,7 @@ span_head()
|
|||
span_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair=$(vnet_mkepair)
|
||||
epair_span=$(vnet_mkepair)
|
||||
|
@ -326,6 +331,7 @@ delete_with_members_head()
|
|||
delete_with_members_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
epair=$(vnet_mkepair)
|
||||
|
@ -352,6 +358,7 @@ mac_conflict_head()
|
|||
mac_conflict_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair=$(vnet_mkepair)
|
||||
|
||||
|
@ -390,6 +397,7 @@ inherit_mac_head()
|
|||
inherit_mac_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
epair=$(vnet_mkepair)
|
||||
|
@ -418,6 +426,7 @@ stp_validation_head()
|
|||
stp_validation_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair_one=$(vnet_mkepair)
|
||||
epair_two=$(vnet_mkepair)
|
||||
|
@ -461,6 +470,7 @@ gif_head()
|
|||
gif_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair=$(vnet_mkepair)
|
||||
|
||||
|
@ -545,6 +555,7 @@ check_mtu()
|
|||
mtu_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair=$(vnet_mkepair)
|
||||
gif=$(ifconfig gif create)
|
||||
|
@ -606,6 +617,7 @@ vlan_head()
|
|||
vlan_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
vid=1
|
||||
|
||||
|
@ -673,6 +685,7 @@ many_bridge_members_head()
|
|||
many_bridge_members_body()
|
||||
{
|
||||
vnet_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
ifcount=256
|
||||
|
|
|
@ -602,6 +602,7 @@ multi_client_head()
|
|||
multi_client_body()
|
||||
{
|
||||
ovpn_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
srv=$(vnet_mkepair)
|
||||
|
@ -814,6 +815,7 @@ ra_head()
|
|||
ra_body()
|
||||
{
|
||||
ovpn_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
srv=$(vnet_mkepair)
|
||||
|
|
|
@ -71,6 +71,7 @@ basic_v4_head()
|
|||
basic_v4_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
epair_one=$(vnet_mkepair)
|
||||
|
@ -115,6 +116,7 @@ vrrp_v4_head()
|
|||
vrrp_v4_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
j=vrrp_basic_v4
|
||||
|
||||
|
@ -161,6 +163,7 @@ unicast_v4_head()
|
|||
unicast_v4_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
epair_one=$(vnet_mkepair)
|
||||
|
@ -218,6 +221,7 @@ basic_v6_head()
|
|||
basic_v6_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
epair_one=$(vnet_mkepair)
|
||||
|
@ -265,6 +269,7 @@ vrrp_v6_head()
|
|||
vrrp_v6_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
j=carp_basic_v6
|
||||
|
||||
|
@ -314,6 +319,7 @@ unicast_v6_head()
|
|||
unicast_v6_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
epair_one=$(vnet_mkepair)
|
||||
|
@ -375,6 +381,7 @@ unicast_ll_v6_head()
|
|||
unicast_ll_v6_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
j=carp_uni_ll_v6
|
||||
|
||||
|
@ -485,6 +492,7 @@ nd6_ns_source_mac_head()
|
|||
nd6_ns_source_mac_body()
|
||||
{
|
||||
carp_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
epair_one=$(vnet_mkepair)
|
||||
|
|
|
@ -83,6 +83,7 @@ local_redirect_body()
|
|||
firewall=$1
|
||||
firewall_init $firewall
|
||||
nat_init $firewall
|
||||
vnet_init_bridge
|
||||
|
||||
bridge=$(vnet_mkbridge)
|
||||
ifconfig ${bridge} 192.0.2.1/24 up
|
||||
|
|
|
@ -156,9 +156,7 @@ codel_bridge_body()
|
|||
{
|
||||
altq_init
|
||||
is_altq_supported codel
|
||||
if ! kldstat -q -m if_bridge; then
|
||||
atf_skip "This test requires if_bridge"
|
||||
fi
|
||||
vnet_init_bridge
|
||||
|
||||
epair=$(vnet_mkepair)
|
||||
ifconfig ${epair}a 192.0.2.1/24 up
|
||||
|
|
|
@ -335,6 +335,7 @@ pbr_common_body()
|
|||
atf_skip "This test requires carp"
|
||||
fi
|
||||
pfsynct_init
|
||||
vnet_init_bridge
|
||||
|
||||
bridge0=$(vnet_mkbridge)
|
||||
bridge1=$(vnet_mkbridge)
|
||||
|
|
|
@ -504,6 +504,7 @@ pfsync_body()
|
|||
|
||||
sctp_init
|
||||
pfsynct_init
|
||||
vnet_init_bridge
|
||||
if ! kldstat -q -m carp
|
||||
then
|
||||
atf_skip "This test requires carp"
|
||||
|
|
|
@ -39,6 +39,7 @@ rst_head()
|
|||
rst_body()
|
||||
{
|
||||
pft_init
|
||||
vnet_init_bridge
|
||||
|
||||
epair_srv=$(vnet_mkepair)
|
||||
epair_cl=$(vnet_mkepair)
|
||||
|
|
Loading…
Reference in a new issue