]> www.infradead.org Git - users/hch/misc.git/commitdiff
selftests: traceroute: Use require_command()
authorIdo Schimmel <idosch@nvidia.com>
Mon, 8 Sep 2025 07:32:35 +0000 (10:32 +0300)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 11 Sep 2025 10:22:38 +0000 (12:22 +0200)
Use require_command() so that the test will return SKIP (4) when a
required command is not present.

Before:

 # ./traceroute.sh
 SKIP: Could not run IPV6 test without traceroute6
 SKIP: Could not run IPV4 test without traceroute
 $ echo $?
 0

After:

 # ./traceroute.sh
 TEST: traceroute6 not installed                                    [SKIP]
 $ echo $?
 4

Reviewed-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250908073238.119240-6-idosch@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
tools/testing/selftests/net/traceroute.sh

index 46cb37e124cefda89618b115cae736c9aea2479d..1ac91eebd16f56e18221913bd15fd6fb89938fa8 100755 (executable)
@@ -181,11 +181,6 @@ setup_traceroute6()
 
 run_traceroute6()
 {
-       if [ ! -x "$(command -v traceroute6)" ]; then
-               echo "SKIP: Could not run IPV6 test without traceroute6"
-               return
-       fi
-
        setup_traceroute6
 
        RET=0
@@ -249,11 +244,6 @@ setup_traceroute()
 
 run_traceroute()
 {
-       if [ ! -x "$(command -v traceroute)" ]; then
-               echo "SKIP: Could not run IPV4 test without traceroute"
-               return
-       fi
-
        setup_traceroute
 
        RET=0
@@ -287,6 +277,9 @@ do
        esac
 done
 
+require_command traceroute6
+require_command traceroute
+
 run_tests
 
 exit "${EXIT_STATUS}"