selftests: net: Fix problems in some drivers/net tests
Subsystems (6)
cover selftests: net: Fix problems in some drivers/net tests
From: Benjamin Poirier <[email protected]>
Fix two problems mostly introduced in commit bbb774d921e2 ("net: Add tests for bonding and team address list management").
Benjamin Poirier (2):
selftests: net: Fix cross-tree inclusion of scripts
selftests: net: Fix netdev name mismatch in cleanup
tools/testing/selftests/drivers/net/bonding/Makefile | 4 +++- .../testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +- .../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 + .../selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 4 ++-- tools/testing/selftests/drivers/net/team/Makefile | 4 ++++ tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 6 +++--- tools/testing/selftests/drivers/net/team/lag_lib.sh | 1 + .../selftests/drivers/net/team/net_forwarding_lib.sh | 1 + tools/testing/selftests/lib.mk | 4 ++-- 9 files changed, 18 insertions(+), 9 deletions(-) create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
Signature · 1 line
2.37.2
PATCH 1/2 selftests: net: Fix cross-tree inclusion of scripts
When exporting and running a subset of selftests via kselftest, files from parts of the source tree which were not exported are not available. A few tests are trying to source such files. Address the problem by using symlinks.
The problem can be reproduced by running:
make -C tools/testing/selftests gen_tar TARGETS="drivers/net/bonding" [... extract archive ...]
./run_kselftest.sh
or:
make kselftest KBUILD_OUTPUT=/tmp/kselftests TARGETS="drivers/net/bonding"
--- tools/testing/selftests/drivers/net/bonding/Makefile | 4 +++- tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +- .../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 + .../selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 4 ++-- tools/testing/selftests/drivers/net/team/Makefile | 4 ++++ tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 4 ++-- tools/testing/selftests/drivers/net/team/lag_lib.sh | 1 + .../testing/selftests/drivers/net/team/net_forwarding_lib.sh | 1 + tools/testing/selftests/lib.mk | 4 ++-- 9 files changed, 17 insertions(+), 8 deletions(-) create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
tools/testing/selftests/drivers/net/bonding/Makefile +3 -1
@@ -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
tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh +1 -1
@@ -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
tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh new file +1 -0
@@ -0,0 +1 @@ +../../../net/forwarding/lib.sh
tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh +2 -2
@@ -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"
tools/testing/selftests/drivers/net/team/Makefile +4 -0
@@ -3,4 +3,8 @@ TEST_PROGS := dev_addr_lists.sh +TEST_FILES := \ + lag_lib.sh \ + net_forwarding_lib.sh + include ../../../lib.mk
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh +2 -2
@@ -11,9 +11,9 @@ 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()
tools/testing/selftests/drivers/net/team/lag_lib.sh new file +1 -0
@@ -0,0 +1 @@ +../bonding/lag_lib.sh
tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh new file +1 -0
@@ -0,0 +1 @@ +../../../net/forwarding/lib.sh
tools/testing/selftests/lib.mk +2 -2
@@ -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
Signature · 1 line
2.37.2
PATCH 2/2 selftests: net: Fix netdev name mismatch in cleanup
In reply to Benjamin Poirierlag_lib.sh creates the interfaces dummy1 and dummy2 whereas dev_addr_lists.sh:destroy() deletes the interfaces dummy0 and dummy1. Fix the mismatch in names.
--- tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/drivers/net/team/dev_addr_lists.sh +1 -1
@@ -18,7 +18,7 @@ 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
Signature · 1 line
2.37.2
Quoted 19 lines · Benjamin Poirier
From: Benjamin Poirier <[email protected]>
Fix two problems mostly introduced in commit
bbb774d921e2("net: Add tests for bonding and team address list management").Benjamin Poirier (2):
selftests: net: Fix cross-tree inclusion of scripts
selftests: net: Fix netdev name mismatch in cleanuptools/testing/selftests/drivers/net/bonding/Makefile | 4 +++- .../testing/selftests/drivers/net/bonding/dev_addr_lists.sh | 2 +- .../selftests/drivers/net/bonding/net_forwarding_lib.sh | 1 + .../selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 4 ++-- tools/testing/selftests/drivers/net/team/Makefile | 4 ++++ tools/testing/selftests/drivers/net/team/dev_addr_lists.sh | 6 +++--- tools/testing/selftests/drivers/net/team/lag_lib.sh | 1 + .../selftests/drivers/net/team/net_forwarding_lib.sh | 1 + tools/testing/selftests/lib.mk | 4 ++-- 9 files changed, 18 insertions(+), 9 deletions(-)
Quoted 4 lines
create mode 120000
tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.shcreate mode 120000tools/testing/selftests/drivers/net/team/lag_lib.shcreate mode 120000tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh
Looks good, thanks.
For the series
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Wed, 19 Oct 2022 18:10:40 +0900 you wrote:
From: Benjamin Poirier <[email protected]>
Fix two problems mostly introduced in commit
bbb774d921e2("net: Add tests for bonding and team address list management").Benjamin Poirier (2):
selftests: net: Fix cross-tree inclusion of scripts
selftests: net: Fix netdev name mismatch in cleanup[...]
Here is the summary with links:
- [net,1/2] selftests: net: Fix cross-tree inclusion of scripts
https://git.kernel.org/netdev/net/c/ae108c48b5d2 - [net,2/2] selftests: net: Fix netdev name mismatch in cleanup https://git.kernel.org/netdev/net/c/b2c0921b926c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html