]> git.baikalelectronics.ru Git - kernel.git/commitdiff
selftests: Update fib_nexthop_multiprefix to handle missing ping6
authorDavid Ahern <dsahern@gmail.com>
Tue, 17 Sep 2019 17:30:35 +0000 (10:30 -0700)
committerJakub Kicinski <jakub.kicinski@netronome.com>
Sat, 21 Sep 2019 01:18:16 +0000 (18:18 -0700)
Some distributions (e.g., debian buster) do not install ping6. Re-use
the hook in pmtu.sh to detect this and fallback to ping.

Fixes: 96c059d73efb ("selftests: Add test with multiple prefixes using single nexthop")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
tools/testing/selftests/net/fib_nexthop_multiprefix.sh

index e6828732843ee1be24c18188c05c8cb4099208b9..9dc35a16e4159685fb58ec11e3863afc906ab2cf 100755 (executable)
@@ -15,6 +15,8 @@
 PAUSE_ON_FAIL=no
 VERBOSE=0
 
+which ping6 > /dev/null 2>&1 && ping6=$(which ping6) || ping6=$(which ping)
+
 ################################################################################
 # helpers
 
@@ -200,7 +202,7 @@ validate_v6_exception()
        local rc
 
        if [ ${ping_sz} != "0" ]; then
-               run_cmd ip netns exec h0 ping6 -s ${ping_sz} -c5 -w5 ${dst}
+               run_cmd ip netns exec h0 ${ping6} -s ${ping_sz} -c5 -w5 ${dst}
        fi
 
        if [ "$VERBOSE" = "1" ]; then
@@ -243,7 +245,7 @@ do
                run_cmd taskset -c ${c} ip netns exec h0 ping -c1 -w1 172.16.10${i}.1
                [ $? -ne 0 ] && printf "\nERROR: ping to h${i} failed\n" && ret=1
 
-               run_cmd taskset -c ${c} ip netns exec h0 ping6 -c1 -w1 2001:db8:10${i}::1
+               run_cmd taskset -c ${c} ip netns exec h0 ${ping6} -c1 -w1 2001:db8:10${i}::1
                [ $? -ne 0 ] && printf "\nERROR: ping6 to h${i} failed\n" && ret=1
 
                [ $ret -ne 0 ] && break