Commit 6500780c authored Jan 26, 2024 by Benjamin Poirier Committed by David S. Miller Jan 31, 2024

selftests: bonding: Add net/forwarding/lib.sh to TEST_INCLUDES



In order to avoid duplicated files when both the bonding and forwarding
tests are exported together, add net/forwarding/lib.sh to TEST_INCLUDES and
include it via its relative path.

Reviewed-by: Petr Machata <petrm@nvidia.com>
Tested-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com>
Reviewed-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2a0683be

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,9 @@ TEST_PROGS := \
		TEST_FILES := \
		lag_lib.sh \
		bond_topo_2d1c.sh \
		bond_topo_3d1c.sh \
		net_forwarding_lib.sh
		bond_topo_3d1c.sh

		TEST_INCLUDES := \
		../../../net/forwarding/lib.sh

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

tools/testing/selftests/drivers/net/bonding/bond-eth-type-change.sh

+1 −1

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

		bond_check_flags()
		{

tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		REQUIRE_MZ=no
		NUM_NETIFS=0
		lib_dir=$(dirname "$0")
		source ${lib_dir}/net_forwarding_lib.sh
		source "$lib_dir"/../../../net/forwarding/lib.sh

		s_ns="s-$(mktemp -u XXXXXX)"
		c_ns="c-$(mktemp -u XXXXXX)"

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/mode-1-recovery-updelay.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ REQUIRE_MZ=no
		REQUIRE_JQ=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

		cleanup()