Hi Hangbin,

On 23/05/2025 05:44, Hangbin Liu wrote:
> 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.

Thank you for the modifications! I wanted to do the same at some points,
then I forgot :)

> Signed-off-by: Hangbin Liu <[email protected]>
> ---
>  tools/testing/selftests/net/Makefile          |  2 +-
>  tools/testing/selftests/net/busy_poll_test.sh |  2 +-
>  .../net/ipv6_route_update_soft_lockup.sh      |  1 -
>  tools/testing/selftests/net/lib.sh            | 21 ++++++++++++++++
>  tools/testing/selftests/net/mptcp/Makefile    |  2 +-
>  .../testing/selftests/net/mptcp/mptcp_lib.sh  |  1 -
>  tools/testing/selftests/net/net_helper.sh     | 25 -------------------
>  tools/testing/selftests/net/pmtu.sh           |  1 -
>  tools/testing/selftests/net/udpgro.sh         |  2 +-
>  tools/testing/selftests/net/udpgro_bench.sh   |  2 +-
>  tools/testing/selftests/net/udpgro_frglist.sh |  2 +-
>  tools/testing/selftests/net/udpgro_fwd.sh     |  2 +-
>  12 files changed, 28 insertions(+), 35 deletions(-)
>  delete mode 100644 tools/testing/selftests/net/net_helper.sh

The changes in MPTCP and others look good to me, except that I think you
forgot to modify files in tools/testing/selftests/drivers/net as well:

> tools/testing/selftests/drivers/net/Makefile:            
> ../../net/net_helper.sh \
> tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh:source 
> "${LIBDIR}"/../../../../net/net_helper.sh
> tools/testing/selftests/drivers/net/netdevsim/peer.sh:source 
> ../../../net/net_helper.sh
pw-bot: cr

Note that the "netdev/check_selftest" NIPA check will not handle this
case where a shell script is removed. But that's OK, it can be ignored.

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.


Reply via email to