selftests: forwarding: lib: Split setup_wait()

setup_wait() takes an optional argument and then is called from the top
level of the test script. That confuses shellcheck, which thinks that maybe
the intention is to pass $1 of the script to the function, which is never
the case. To avoid having to annotate every single new test with a SC
disable, split the function in two: one that takes a mandatory argument,
and one that takes no argument at all.

Convert the two existing users of that optional argument, both in Spectrum
resource selftest, to use the new form. Clean up vxlan_bridge_1q_mc_ul.sh
to not pass a now-unused argument.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Link: https://patch.msgid.link/8e13123236fe3912ae29bc04a1528bdd8551da1f.1750847794.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Petr Machata 2025-06-25 12:41:23 +02:00 committed by Jakub Kicinski
parent 040ae95a98
commit b7863babce
4 changed files with 10 additions and 5 deletions

View File

@ -51,7 +51,7 @@ for current_test in ${TESTS:-$ALL_TESTS}; do
fi
${current_test}_setup_prepare
setup_wait $num_netifs
setup_wait_n $num_netifs
# Update target in case occupancy of a certain resource changed
# following the test setup.
target=$(${current_test}_get_target "$should_fail")

View File

@ -55,7 +55,7 @@ for current_test in ${TESTS:-$ALL_TESTS}; do
continue
fi
${current_test}_setup_prepare
setup_wait $num_netifs
setup_wait_n $num_netifs
# Update target in case occupancy of a certain resource
# changed following the test setup.
target=$(${current_test}_get_target "$should_fail")

View File

@ -526,9 +526,9 @@ setup_wait_dev_with_timeout()
return 1
}
setup_wait()
setup_wait_n()
{
local num_netifs=${1:-$NUM_NETIFS}
local num_netifs=$1; shift
local i
for ((i = 1; i <= num_netifs; ++i)); do
@ -539,6 +539,11 @@ setup_wait()
sleep $WAIT_TIME
}
setup_wait()
{
setup_wait_n "$NUM_NETIFS"
}
wait_for_dev()
{
local dev=$1; shift

View File

@ -765,7 +765,7 @@ ipv6_mcroute_fdb_sep_rx()
trap cleanup EXIT
setup_prepare
setup_wait "$NUM_NETIFS"
setup_wait
tests_run
exit "$EXIT_STATUS"