mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-22 04:31:58 +08:00
Merge branch 'selftests-net-more-small-fixes'
Benjamin Poirier says: ==================== selftests: net: More small fixes Some small fixes for net selftests which follow from these recent commits:dd2d40acdb
("selftests: bonding: Add more missing config options")49078c1b80
("selftests: forwarding: Remove executable bits from lib.sh") ==================== Link: https://lore.kernel.org/r/20240131140848.360618-1-bpoirier@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
cf6601e289
@ -48,6 +48,17 @@ test_LAG_cleanup()
|
||||
ip link add mv0 link "$name" up address "$ucaddr" type macvlan
|
||||
# Used to test dev->mc handling
|
||||
ip address add "$addr6" dev "$name"
|
||||
|
||||
# Check that addresses were added as expected
|
||||
(grep_bridge_fdb "$ucaddr" bridge fdb show dev dummy1 ||
|
||||
grep_bridge_fdb "$ucaddr" bridge fdb show dev dummy2) >/dev/null
|
||||
check_err $? "macvlan unicast address not found on a slave"
|
||||
|
||||
# mcaddr is added asynchronously by addrconf_dad_work(), use busywait
|
||||
(busywait 10000 grep_bridge_fdb "$mcaddr" bridge fdb show dev dummy1 ||
|
||||
grep_bridge_fdb "$mcaddr" bridge fdb show dev dummy2) >/dev/null
|
||||
check_err $? "IPv6 solicited-node multicast mac address not found on a slave"
|
||||
|
||||
ip link set dev "$name" down
|
||||
ip link del "$name"
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
CONFIG_DUMMY=y
|
||||
CONFIG_IPV6=y
|
||||
CONFIG_MACVLAN=y
|
||||
CONFIG_NET_TEAM=y
|
||||
CONFIG_NET_TEAM_MODE_LOADBALANCE=y
|
||||
CONFIG_MACVLAN=y
|
||||
|
@ -53,9 +53,7 @@ TEST_PROGS += bind_bhash.sh
|
||||
TEST_PROGS += ip_local_port_range.sh
|
||||
TEST_PROGS += rps_default_mask.sh
|
||||
TEST_PROGS += big_tcp.sh
|
||||
TEST_PROGS_EXTENDED := in_netns.sh setup_loopback.sh setup_veth.sh
|
||||
TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh lib.sh
|
||||
TEST_PROGS_EXTENDED += net_helper.sh
|
||||
TEST_PROGS_EXTENDED := toeplitz_client.sh toeplitz.sh
|
||||
TEST_GEN_FILES = socket nettest
|
||||
TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any
|
||||
TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite
|
||||
@ -97,6 +95,7 @@ TEST_PROGS += fq_band_pktlimit.sh
|
||||
TEST_PROGS += vlan_hw_filter.sh
|
||||
|
||||
TEST_FILES := settings
|
||||
TEST_FILES += in_netns.sh lib.sh net_helper.sh setup_loopback.sh setup_veth.sh
|
||||
|
||||
include ../lib.mk
|
||||
|
||||
|
@ -112,7 +112,7 @@ TEST_PROGS = bridge_fdb_learning_limit.sh \
|
||||
vxlan_symmetric_ipv6.sh \
|
||||
vxlan_symmetric.sh
|
||||
|
||||
TEST_PROGS_EXTENDED := devlink_lib.sh \
|
||||
TEST_FILES := devlink_lib.sh \
|
||||
ethtool_lib.sh \
|
||||
fib_offload_lib.sh \
|
||||
forwarding.config.sample \
|
||||
|
0
tools/testing/selftests/net/net_helper.sh
Executable file → Normal file
0
tools/testing/selftests/net/net_helper.sh
Executable file → Normal file
0
tools/testing/selftests/net/setup_loopback.sh
Executable file → Normal file
0
tools/testing/selftests/net/setup_loopback.sh
Executable file → Normal file
Loading…
Reference in New Issue
Block a user