Re: [PATCH net-next 01/38] selftests/net: add lib.sh

Hangbin Liu liuhangbin@gmail.com writes:

Add a lib.sh for net selftests. This file can be used to define commonly used variables and functions.

Add function setup_ns() for user to create unique namespaces with given prefix name.

Signed-off-by: Hangbin Liu liuhangbin@gmail.com

tools/testing/selftests/net/Makefile | 2 +- tools/testing/selftests/net/lib.sh | 98 ++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/net/lib.sh

diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 9274edfb76ff..14bd68da7466 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -54,7 +54,7 @@ TEST_PROGS += ip_local_port_range.sh TEST_PROGS += rps_default_mask.sh TEST_PROGS += big_tcp.sh TEST_PROGS_EXTENDED := in_netns.sh setup_loopback.sh setup_veth.sh -TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh +TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh lib.sh TEST_GEN_FILES = socket nettest TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh new file mode 100644 index 000000000000..239ab2beb438 --- /dev/null +++ b/tools/testing/selftests/net/lib.sh @@ -0,0 +1,98 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0

+############################################################################## +# Defines

+# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 +# namespace list created by setup_ns +NS_LIST=""

+############################################################################## +# Helpers +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

+}

This is lifted from forwarding/lib.sh, right? Would it make sense to just source this new file from forwarding/lib.sh instead of copying stuff around? I imagine there will eventually be more commonality, and when that pops up, we can just shuffle the forwarding code to net/lib.sh.