]> git.hungrycats.org Git - linux/commitdiff
selftests/net/lib: no need to record ns name if it already exist
authorHangbin Liu <liuhangbin@gmail.com>
Tue, 14 May 2024 02:33:59 +0000 (10:33 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2024 07:49:50 +0000 (09:49 +0200)
[ Upstream commit 83e93942796db58652288f0391ac00072401816f ]

There is no need to add the name to ns_list again if the netns already
recoreded.

Fixes: 25ae948b4478 ("selftests/net: add lib.sh")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/net/lib.sh

index f9fe182dfbd44e9de0f0caa27b409281c0584081..56a9454b7ba353656c395b25aad047ec32e1249d 100644 (file)
@@ -73,15 +73,17 @@ setup_ns()
        local ns=""
        local ns_name=""
        local ns_list=""
+       local ns_exist=
        for ns_name in "$@"; do
                # Some test may setup/remove same netns multi times
                if unset ${ns_name} 2> /dev/null; then
                        ns="${ns_name,,}-$(mktemp -u XXXXXX)"
                        eval readonly ${ns_name}="$ns"
+                       ns_exist=false
                else
                        eval ns='$'${ns_name}
                        cleanup_ns "$ns"
-
+                       ns_exist=true
                fi
 
                if ! ip netns add "$ns"; then
@@ -90,7 +92,7 @@ setup_ns()
                        return $ksft_skip
                fi
                ip -n "$ns" link set lo up
-               ns_list="$ns_list $ns"
+               ! $ns_exist && ns_list="$ns_list $ns"
        done
        NS_LIST="$NS_LIST $ns_list"
 }