From: Hangbin Liu When I tried to install and run bonding selftests via: make INSTALL_PATH=/tmp/kself TARGETS=drivers/net/bonding \ -C tools/testing/selftests install Some tests fail because net/lib/sh/defer.sh is missing: /tmp/kself/net/forwarding/../lib.sh: line 5: /tmp/kself/net/lib/sh/defer.sh: No such file or directory One option is to add defer.sh directly to TEST_INCLUDES. Alternatively, follow the approach from commit f72aa1b27628 ("selftests: net: include lib/sh/*.sh with lib.sh"), which pulls in all .sh files to accommodate future changes to the library directory. This patch adds a wildcard to include all shell files for drivers/net tests that consume net lib.sh. TEST_INCLUDES is also sorted to avoid ordering‑related problems for future modifications. The team driver is not affected by this bug, but we use the wildcard for it as well, rather than listing only defer.sh. Fixes: a6e263f125cd ("selftests: net: lib: Introduce deferred commands") Signed-off-by: Hangbin Liu --- Since this is a trivial fix, I have also updated the virtio_net part within this patch. Please let me know if I should split the virtio_net changes into a separate patch. Before posting the patch, I ran `make install` for each subtest and verified that `defer.sh` gets installed. --- tools/testing/selftests/drivers/net/Makefile | 1 + tools/testing/selftests/drivers/net/bonding/Makefile | 3 ++- tools/testing/selftests/drivers/net/dsa/Makefile | 1 + tools/testing/selftests/drivers/net/hw/Makefile | 3 ++- tools/testing/selftests/drivers/net/netconsole/Makefile | 3 ++- tools/testing/selftests/drivers/net/team/Makefile | 4 ++-- tools/testing/selftests/drivers/net/virtio_net/Makefile | 1 + 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile index d5bf4cb638a8..ab39c2e508f0 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -3,6 +3,7 @@ CFLAGS += $(KHDR_INCLUDES) TEST_INCLUDES := $(wildcard lib/py/*.py) \ $(wildcard lib/sh/*.sh) \ + $(wildcard ../../net/lib/sh/*.sh) \ ../../net/lib.sh \ TEST_GEN_FILES := \ diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools/testing/selftests/drivers/net/bonding/Makefile index 6364ca02642d..e337c099fb40 100644 --- a/tools/testing/selftests/drivers/net/bonding/Makefile +++ b/tools/testing/selftests/drivers/net/bonding/Makefile @@ -27,9 +27,10 @@ TEST_FILES := \ # end of TEST_FILES TEST_INCLUDES := \ - ../../../net/lib.sh \ + $(wildcard ../../../net/lib/sh/*.sh) \ ../lib/sh/lib_netcons.sh \ ../../../net/forwarding/lib.sh \ + ../../../net/lib.sh \ # end of TEST_INCLUDES include ../../../lib.mk diff --git a/tools/testing/selftests/drivers/net/dsa/Makefile b/tools/testing/selftests/drivers/net/dsa/Makefile index 7994bd0e5c44..7893011b3842 100644 --- a/tools/testing/selftests/drivers/net/dsa/Makefile +++ b/tools/testing/selftests/drivers/net/dsa/Makefile @@ -19,6 +19,7 @@ TEST_FILES := \ # end of TEST_FILES TEST_INCLUDES := \ + $(wildcard ../../../net/lib/sh/*.sh) \ ../../../net/forwarding/bridge_locked_port.sh \ ../../../net/forwarding/bridge_mdb.sh \ ../../../net/forwarding/bridge_mld.sh \ diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testing/selftests/drivers/net/hw/Makefile index 78bb0169350b..17c7e878ca42 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -64,10 +64,11 @@ TEST_FILES := \ TEST_INCLUDES := \ $(wildcard lib/py/*.py ../lib/py/*.py) \ - ../../../net/lib.sh \ + $(wildcard ../../../net/lib/sh/*.sh) \ ../../../net/forwarding/ipip_lib.sh \ ../../../net/forwarding/lib.sh \ ../../../net/forwarding/tc_common.sh \ + ../../../net/lib.sh \ # # YNL files, must be before "include ..lib.mk" diff --git a/tools/testing/selftests/drivers/net/netconsole/Makefile b/tools/testing/selftests/drivers/net/netconsole/Makefile index f0674c0017fc..c7972a40babf 100644 --- a/tools/testing/selftests/drivers/net/netconsole/Makefile +++ b/tools/testing/selftests/drivers/net/netconsole/Makefile @@ -1,8 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 TEST_INCLUDES := \ - ../../../net/lib.sh \ + $(wildcard ../../../net/lib/sh/*.sh) \ ../lib/sh/lib_netcons.sh \ + ../../../net/lib.sh \ # end of TEST_INCLUDES TEST_PROGS := \ diff --git a/tools/testing/selftests/drivers/net/team/Makefile b/tools/testing/selftests/drivers/net/team/Makefile index 7c58cf82121e..e40c83a92724 100644 --- a/tools/testing/selftests/drivers/net/team/Makefile +++ b/tools/testing/selftests/drivers/net/team/Makefile @@ -13,12 +13,12 @@ TEST_PROGS := \ # end of TEST_PROGS TEST_INCLUDES := \ - team_lib.sh \ + $(wildcard ../../../net/lib/sh/*.sh) \ ../bonding/lag_lib.sh \ ../../../net/forwarding/lib.sh \ ../../../net/in_netns.sh \ ../../../net/lib.sh \ - ../../../net/lib/sh/defer.sh \ + team_lib.sh \ # end of TEST_INCLUDES include ../../../lib.mk diff --git a/tools/testing/selftests/drivers/net/virtio_net/Makefile b/tools/testing/selftests/drivers/net/virtio_net/Makefile index 868ece3fea1f..df34e29b5680 100644 --- a/tools/testing/selftests/drivers/net/virtio_net/Makefile +++ b/tools/testing/selftests/drivers/net/virtio_net/Makefile @@ -5,6 +5,7 @@ TEST_PROGS = basic_features.sh TEST_FILES = virtio_net_common.sh TEST_INCLUDES = \ + $(wildcard ../../../net/lib/sh/*.sh) \ ../../../net/forwarding/lib.sh \ ../../../net/lib.sh \ # end of TEST_INCLUDES --- base-commit: 38b6be101006d3e7af972999f45d4f1e8250587a change-id: 20260904-selftest_lib_defer-0174ce436d8a Best regards, -- Hangbin Liu