iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: forwarding: Remove duplicated lib.sh content

Browse Source 
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>
This commit is contained in:
Petr Machata 2024-01-26 18:21:23 -05:00 committed by David S. Miller
parent 9f2af91591
commit 521ed1ce94
5 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/testing/selftests/drivers/net/bonding/Makefile
View File

@ -18,6 +18,7 @@ TEST_FILES := \
bond_topo_3d1c.sh
TEST_INCLUDES := \
../../../net/forwarding/lib.sh
../../../net/forwarding/lib.sh \
../../../net/lib.sh
include ../../../lib.mk

3
tools/testing/selftests/drivers/net/dsa/Makefile
View File

@ -26,6 +26,7 @@ TEST_INCLUDES := \
../../../net/forwarding/local_termination.sh \
../../../net/forwarding/no_forwarding.sh \
../../../net/forwarding/tc_actions.sh \
../../../net/forwarding/tc_common.sh
../../../net/forwarding/tc_common.sh \
../../../net/lib.sh
include ../../../lib.mk

3
tools/testing/selftests/drivers/net/team/Makefile
View File

@ -5,6 +5,7 @@ TEST_PROGS := dev_addr_lists.sh
TEST_INCLUDES := \
../bonding/lag_lib.sh \
../../../net/forwarding/lib.sh
../../../net/forwarding/lib.sh \
../../../net/lib.sh
include ../../../lib.mk

3
tools/testing/selftests/net/forwarding/Makefile
View File

@ -129,4 +129,7 @@ TEST_PROGS_EXTENDED := devlink_lib.sh \
sch_tbf_etsprio.sh \
tc_common.sh
TEST_INCLUDES := \
../lib.sh
include ../../lib.mk

26
tools/testing/selftests/net/forwarding/lib.sh
View File

@ -35,31 +35,7 @@ if [[ -f $net_forwarding_dir/forwarding.config ]]; then
source "$net_forwarding_dir/forwarding.config"
fi
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
busywait()
{
local timeout=$1; shift
local start_time="$(date -u +%s%3N)"
while true
do
local out
out=$("$@")
local ret=$?
if ((!ret)); then
echo -n "$out"
return 0
fi
local current_time="$(date -u +%s%3N)"
if ((current_time - start_time > timeout)); then
echo -n "$out"
return 1
fi
done
}
source "$net_forwarding_dir/../lib.sh"
##############################################################################
# Sanity checks