Commit d9d836bf authored by Hangbin Liu's avatar Hangbin Liu Committed by Jakub Kicinski
Browse files

selftests: net: move wait_local_port_listen to lib.sh 



The function wait_local_port_listen() is the only function defined in
net_helper.sh. Since some tests source both lib.sh and net_helper.sh,
we can simplify the setup by moving wait_local_port_listen() to lib.sh.

With this change, net_helper.sh becomes redundant and can be removed.

Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250526014600.9128-1-liuhangbin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 08f8bad0

tools/testing/selftests/drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ CFLAGS += $(KHDR_INCLUDES) 


TEST_INCLUDES := $(wildcard lib/py/*.py) \

		 $(wildcard lib/sh/*.sh) \

		 ../../net/net_helper.sh \

		 ../../net/lib.sh \



TEST_GEN_FILES := \

tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ NSIM_DEV_SYS_NEW="/sys/bus/netdevsim/new_device" 


# Used to create and delete namespaces

source "${LIBDIR}"/../../../../net/lib.sh

source "${LIBDIR}"/../../../../net/net_helper.sh



# Create netdevsim interfaces

create_ifaces() {

tools/testing/selftests/drivers/net/netdevsim/peer.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0-only



source ../../../net/net_helper.sh

source ../../../net/lib.sh



NSIM_DEV_1_ID=$((256 + RANDOM % 256))

NSIM_DEV_1_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_DEV_1_ID

tools/testing/selftests/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ YNL_GEN_FILES := busy_poller netlink-dumps 
TEST_GEN_FILES += $(YNL_GEN_FILES)



TEST_FILES := settings

TEST_FILES += in_netns.sh lib.sh net_helper.sh setup_loopback.sh setup_veth.sh

TEST_FILES += in_netns.sh lib.sh setup_loopback.sh setup_veth.sh



TEST_GEN_FILES += $(patsubst %.c,%.o,$(wildcard *.bpf.c))

tools/testing/selftests/net/busy_poll_test.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0

source net_helper.sh

source lib.sh



NSIM_SV_ID=$((256 + RANDOM % 256))

NSIM_SV_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_SV_ID