Skip to content

Commit f72aa1b

Browse files
matttbekuba-moo
authored andcommitted
selftests: net: include lib/sh/*.sh with lib.sh
Recently, the net/lib.sh file has been modified to include defer.sh from net/lib/sh/ directory. The Makefile from net/lib has been modified accordingly, but not the ones from the sub-targets using net/lib.sh. Because of that, the new file is not installed as expected when installing the Forwarding, MPTCP, and Netfilter targets, e.g. # make -C tools/testing/selftests TARGETS=net/mptcp install \ INSTALL_PATH=/tmp/kself # cd /tmp/kself/ # ./run_kselftest.sh -c net/mptcp TAP version 13 1..7 # timeout set to 1800 # selftests: net/mptcp: mptcp_connect.sh # ./../lib.sh: line 5: /tmp/kself/net/lib/sh/defer.sh: No such file or directory # (...) This can be fixed simply by adding all the .sh files from net/lib/sh directory to the TEST_INCLUDES variable in the different Makefile's. Fixes: a6e263f ("selftests: net: lib: Introduce deferred commands") Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Reviewed-by: Petr Machata <petrm@nvidia.com> Link: https://patch.msgid.link/20241104-net-next-selftests-lib-sh-deps-v1-1-7c9f7d939fc2@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 0452a2d commit f72aa1b

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

tools/testing/selftests/net/forwarding/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ TEST_FILES := devlink_lib.sh \
126126
tc_common.sh
127127

128128
TEST_INCLUDES := \
129-
../lib.sh
129+
../lib.sh \
130+
$(wildcard ../lib/sh/*.sh)
130131

131132
include ../../lib.mk

tools/testing/selftests/net/mptcp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
1111

1212
TEST_FILES := mptcp_lib.sh settings
1313

14-
TEST_INCLUDES := ../lib.sh ../net_helper.sh
14+
TEST_INCLUDES := ../lib.sh $(wildcard ../lib/sh/*.sh) ../net_helper.sh
1515

1616
EXTRA_CLEAN := *.pcap
1717

tools/testing/selftests/net/netfilter/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,5 @@ TEST_FILES := lib.sh
5555
TEST_FILES += packetdrill
5656

5757
TEST_INCLUDES := \
58-
../lib.sh
58+
../lib.sh \
59+
$(wildcard ../lib/sh/*.sh)

0 commit comments

Comments
 (0)