Commit 4a7a8304 authored Oct 20, 2022 by Jakub Kicinski

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

Benjamin Poirier says:

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

Fix two problems mostly introduced in commit bbb774d9 ("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>

parents f8c1c66b b2c0921b

tools/testing/selftests/drivers/net/bonding/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../../../net/forwarding/lib.sh
		No newline at end of file

tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -3,4 +3,8 @@

		TEST_PROGS := dev_addr_lists.sh

		TEST_FILES := \
		lag_lib.sh \
		net_forwarding_lib.sh

		include ../../../lib.mk