]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests: Update fib_tests to handle missing ping6
authorDavid Ahern <dsahern@gmail.com>
Tue, 17 Sep 2019 17:30:21 +0000 (10:30 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2019 11:13:17 +0000 (13:13 +0200)
[ Upstream commit 0360894a05ed52be268e3c4d40b2df9d94975fa6 ]

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: a0e11da78f48 ("fib_tests: Add tests for metrics on routes")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/testing/selftests/net/fib_tests.sh

index 0eca8fef2b9fdc427a2880a98602bfad11f483b1..df7a55d94b753da6ae6fde8ce8d1719dd8e9b7b8 100755 (executable)
@@ -16,6 +16,8 @@ PAUSE_ON_FAIL=no
 PAUSE=no
 IP="ip -netns ns1"
 
+which ping6 > /dev/null 2>&1 && ping6=$(which ping6) || ping6=$(which ping)
+
 log_test()
 {
        local rc=$1
@@ -1068,7 +1070,7 @@ ipv6_route_metrics_test()
        log_test $rc 0 "Multipath route with mtu metric"
 
        $IP -6 ro add 2001:db8:104::/64 via 2001:db8:101::2 mtu 1300
-       run_cmd "ip netns exec ns1 ping6 -w1 -c1 -s 1500 2001:db8:104::1"
+       run_cmd "ip netns exec ns1 ${ping6} -w1 -c1 -s 1500 2001:db8:104::1"
        log_test $? 0 "Using route with mtu metric"
 
        run_cmd "$IP -6 ro add 2001:db8:114::/64 via  2001:db8:101::2  congctl lock foo"