selftests: forwarding: Remove duplicated lib.sh content
authorPetr Machata <petrm@nvidia.com>
Fri, 26 Jan 2024 23:21:23 +0000 (18:21 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 31 Jan 2024 10:55:11 +0000 (10:55 +0000)
commit521ed1ce94bb35842357fb71918d8ebed552f941
tree69d2babcc8d40142fed5fd0cd067a7f62eaf4077
parent9f2af915916b49f2f3a0285cae805a33c2a1dde3
selftests: forwarding: Remove duplicated lib.sh content

commit 25ae948b4478 ("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 commit 2114e83381d3 ("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>
tools/testing/selftests/drivers/net/bonding/Makefile
tools/testing/selftests/drivers/net/dsa/Makefile
tools/testing/selftests/drivers/net/team/Makefile
tools/testing/selftests/net/forwarding/Makefile
tools/testing/selftests/net/forwarding/lib.sh