running the script on systems without netdevsim now prints:

SKIP: ipsec_offload can't load netdevsim

instead of error message & failed status.

Signed-off-by: Florian Westphal <f...@strlen.de>
---
 Feel free to apply to -next, its not a bug fix per se.

 tools/testing/selftests/net/rtnetlink.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/net/rtnetlink.sh 
b/tools/testing/selftests/net/rtnetlink.sh
index b25c9fe019d2..a7a443bdbdd9 100755
--- a/tools/testing/selftests/net/rtnetlink.sh
+++ b/tools/testing/selftests/net/rtnetlink.sh
@@ -699,13 +699,17 @@ kci_test_ipsec_offload()
        sysfsd=/sys/kernel/debug/netdevsim/netdevsim0/ports/0/
        sysfsf=$sysfsd/ipsec
        sysfsnet=/sys/bus/netdevsim/devices/netdevsim0/net/
+       probed=false
 
        # setup netdevsim since dummydev doesn't have offload support
-       modprobe netdevsim
-       check_err $?
-       if [ $ret -ne 0 ]; then
-               echo "FAIL: ipsec_offload can't load netdevsim"
-               return 1
+       if [ ! -w /sys/bus/netdevsim/new_device ] ; then
+               modprobe -q netdevsim
+               check_err $?
+               if [ $ret -ne 0 ]; then
+                       echo "SKIP: ipsec_offload can't load netdevsim"
+                       return $ksft_skip
+               fi
+               probed=true
        fi
 
        echo "0" > /sys/bus/netdevsim/new_device
@@ -785,7 +789,7 @@ EOF
        fi
 
        # clean up any leftovers
-       rmmod netdevsim
+       $probed && rmmod netdevsim
 
        if [ $ret -ne 0 ]; then
                echo "FAIL: ipsec_offload"
-- 
2.21.0

Reply via email to