Commit ae108c48 authored Oct 19, 2022 by Benjamin Poirier Committed by Jakub Kicinski Oct 20, 2022

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"

Fixes: bbb774d9 ("net: Add tests for bonding and team address list management")
Fixes: eccd0a80 ("selftests: net: dsa: add a stress test for unlocked FDB operations")
Link: https://lore.kernel.org/netdev/40f04ded-0c86-8669-24b1-9a313ca21076@redhat.com/


Reported-by: Jonathan Toppins <jtoppins@redhat.com>
Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com>
Reviewed-by: Jonathan Toppins <jtoppins@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent f8c1c66b

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