selftests: forwarding: lib: rewrite processing of command line arguments

The piece of code which processes the command line arguments and
populates NETIFS based on them is really unobvious. Rewrite it so that
the intention is clear and the code is easy to follow.

Suggested-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Link: https://patch.msgid.link/20260407102058.867279-1-ioana.ciornei@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index d8cc4c64148d5aaf0c3ead8a7875e60b2a8a5cba..d2bdbff68075eaa5b869870066eccb343d166ead 100644 (file)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -467,17 +467,18 @@ if [ "${DRIVER_TEST_CONFORMANT}" = "yes" ]; then
        TARGETS[$remote_netif]="$REMOTE_TYPE:$REMOTE_ARGS"
 else
        count=0
+       # Prime NETIFS from the command line, but retain if none given.
+       if [[ $# -gt 0 ]]; then
+               unset NETIFS
+               declare -A NETIFS
 
-       while [[ $# -gt 0 ]]; do
-               if [[ "$count" -eq "0" ]]; then
-                       unset NETIFS
-                       declare -A NETIFS
-               fi
-               count=$((count + 1))
-               NETIFS[p$count]="$1"
-               TARGETS[$1]="local:"
-               shift
-       done
+               while [[ $# -gt 0 ]]; do
+                       count=$((count + 1))
+                       NETIFS[p$count]="$1"
+                       TARGETS[$1]="local:"
+                       shift
+               done
+       fi
 fi
 
 ##############################################################################