mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
521ed1ce94
commit25ae948b44("selftests/net: add lib.sh") added net/lib.sh to contain code shared by tests under net/ and net/forwarding/. However, this caused issues with selftests from directories other than net/forwarding/, in particular those under drivers/net/. Those issues were avoided in a simple way by duplicating some content in commit2114e83381("selftests: forwarding: Avoid failures to source net/lib.sh"). In order to remove the duplicated content, restore the inclusion of net/lib.sh from net/forwarding/lib.sh but with the following changes: * net/lib.sh is imported through the net_forwarding_dir path The original expression "source ../lib.sh" would look for lib.sh in the directory above the script file's one, which did not work for tests under drivers/net/. * net/lib.sh is added to TEST_INCLUDES Since net/forwarding/lib.sh now sources net/lib.sh, both of those files must be exported along with tests which source net/forwarding/lib.sh. Suggested-by: Hangbin Liu <liuhangbin@gmail.com> Reviewed-by: Hangbin Liu <liuhangbin@gmail.com> Signed-off-by: Petr Machata <petrm@nvidia.com> Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
32 lines
893 B
Makefile
32 lines
893 B
Makefile
# SPDX-License-Identifier: GPL-2.0+ OR MIT
|
|
|
|
TEST_PROGS = bridge_locked_port.sh \
|
|
bridge_mdb.sh \
|
|
bridge_mld.sh \
|
|
bridge_vlan_aware.sh \
|
|
bridge_vlan_mcast.sh \
|
|
bridge_vlan_unaware.sh \
|
|
local_termination.sh \
|
|
no_forwarding.sh \
|
|
tc_actions.sh \
|
|
test_bridge_fdb_stress.sh
|
|
|
|
TEST_FILES := \
|
|
run_net_forwarding_test.sh \
|
|
forwarding.config
|
|
|
|
TEST_INCLUDES := \
|
|
../../../net/forwarding/bridge_locked_port.sh \
|
|
../../../net/forwarding/bridge_mdb.sh \
|
|
../../../net/forwarding/bridge_mld.sh \
|
|
../../../net/forwarding/bridge_vlan_aware.sh \
|
|
../../../net/forwarding/bridge_vlan_mcast.sh \
|
|
../../../net/forwarding/bridge_vlan_unaware.sh \
|
|
../../../net/forwarding/lib.sh \
|
|
../../../net/forwarding/local_termination.sh \
|
|
../../../net/forwarding/no_forwarding.sh \
|
|
../../../net/forwarding/tc_actions.sh \
|
|
../../../net/forwarding/tc_common.sh \
|
|
../../../net/lib.sh
|
|
|
|
include ../../../lib.mk
|