iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'selftests-net-fix-problems-in-some-drivers-net-tests'

Browse Source 
Benjamin Poirier says:

====================
selftests: net: Fix problems in some drivers/net tests

Fix two problems mostly introduced in commit bbb774d921e2 ("net: Add tests
for bonding and team address list management").
====================

Link: https://lore.kernel.org/r/20221019091042.783786-1-bpoirier@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2022-10-20 21:09:33 -07:00
commit 4a7a83044f
9 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/drivers/net/bonding/Makefile
View File

@ -7,6 +7,8 @@ TEST_PROGS := \
bond-lladdr-target.sh \
dev_addr_lists.sh
TEST_FILES := lag_lib.sh
TEST_FILES := \
lag_lib.sh \
net_forwarding_lib.sh
include ../../../lib.mk

2
tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh
View File

@ -14,7 +14,7 @@ ALL_TESTS="
REQUIRE_MZ=no
NUM_NETIFS=0
lib_dir=$(dirname "$0")
source "$lib_dir"/../../../net/forwarding/lib.sh
source "$lib_dir"/net_forwarding_lib.sh
source "$lib_dir"/lag_lib.sh

1
tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh Symbolic link
View File

@ -0,0 +1 @@
../../../net/forwarding/lib.sh

4
tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh
View File

@ -18,8 +18,8 @@ NUM_NETIFS=1
REQUIRE_JQ="no"
REQUIRE_MZ="no"
NETIF_CREATE="no"
lib_dir=$(dirname $0)/../../../net/forwarding
source $lib_dir/lib.sh
lib_dir=$(dirname "$0")
source "$lib_dir"/lib.sh
cleanup() {
echo "Cleaning up"

4
tools/testing/selftests/drivers/net/team/Makefile
View File

@ -3,4 +3,8 @@
TEST_PROGS := dev_addr_lists.sh
TEST_FILES := \
lag_lib.sh \
net_forwarding_lib.sh
include ../../../lib.mk

6
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
View File

@ -11,14 +11,14 @@ ALL_TESTS="
REQUIRE_MZ=no
NUM_NETIFS=0
lib_dir=$(dirname "$0")
source "$lib_dir"/../../../net/forwarding/lib.sh
source "$lib_dir"/net_forwarding_lib.sh
source "$lib_dir"/../bonding/lag_lib.sh
source "$lib_dir"/lag_lib.sh
destroy()
{
local ifnames=(dummy0 dummy1 team0 mv0)
local ifnames=(dummy1 dummy2 team0 mv0)
local ifname
for ifname in "${ifnames[@]}"; do

1
tools/testing/selftests/drivers/net/team/lag_lib.sh Symbolic link
View File

@ -0,0 +1 @@
../bonding/lag_lib.sh

1
tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh Symbolic link
View File

@ -0,0 +1 @@
../../../net/forwarding/lib.sh

4
tools/testing/selftests/lib.mk
View File

@ -70,7 +70,7 @@ endef
run_tests: all
ifdef building_out_of_srctree
@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \
rsync -aq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \
rsync -aLq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \
fi
@if [ "X$(TEST_PROGS)" != "X" ]; then \
$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \
@ -84,7 +84,7 @@ endif
define INSTALL_SINGLE_RULE
$(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH))
$(if $(INSTALL_LIST),rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/)
$(if $(INSTALL_LIST),rsync -aL $(INSTALL_LIST) $(INSTALL_PATH)/)
endef
define INSTALL_RULE