selftests: forwarding: Ditch skip_on_veth()

Since the selftests that are not supposed to run on veth pairs are now in
their own dedicated directory, the skip_on_veth logic can go away. Drop it
from the selftests, and from lib.sh.

Cc: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: Petr Machata <petrm@nvidia.com>
Link: https://lore.kernel.org/r/63b470e10d65270571ee7de709b31672ce314872.1711464583.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/drivers/net/hw/ethtool.sh b/tools/testing/selftests/drivers/net/hw/ethtool.sh
index 187429670ee76d375c6873b08896bb1b584d0f1c..bb12d5d709493a05a66f3c46dca0df80b005123d 100755 (executable)
--- a/tools/testing/selftests/drivers/net/hw/ethtool.sh
+++ b/tools/testing/selftests/drivers/net/hw/ethtool.sh
@@ -287,8 +287,6 @@ different_speeds_autoneg_on()
        ethtool -s $h1 autoneg on
 }
 
-skip_on_veth
-
 trap cleanup EXIT
 
 setup_prepare

diff --git a/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh b/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh
index b0f931260a273e4c7bba294e694556171e6c2d5f..a7584448416ea64eaf60ee94b98d6422a0c21a62 100755 (executable)
--- a/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh
+++ b/tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh
@@ -109,8 +109,6 @@ no_cable()
        ip link set dev $swp3 down
 }
 
-skip_on_veth
-
 setup_prepare
 
 tests_run

diff --git a/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh b/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh
index 7447601170053d54d6cc96cb06a2b5c6e2956c96..7dfc50366c992e273665b6fc5efcc882a3bc6241 100755 (executable)
--- a/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh
+++ b/tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh
@@ -325,17 +325,9 @@ setup_wait
 
 used=$(ip -j stats show dev $rp1.200 group offload subgroup hw_stats_info |
           jq '.[].info.l3_stats.used')
-kind=$(ip -j -d link show dev $rp1 |
-          jq -r '.[].linkinfo.info_kind')
-if [[ $used != true ]]; then
-       if [[ $kind == veth ]]; then
-               log_test_skip "l3_stats not offloaded on veth interface"
-               EXIT_STATUS=$ksft_skip
-       else
-               RET=1 log_test "l3_stats not offloaded"
-       fi
-else
-       tests_run
-fi
+[[ $used = true ]]
+check_err $? "hw_stats_info.used=$used"
+log_test "l3_stats offloaded"
+tests_run
 
 exit $EXIT_STATUS

diff --git a/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh b/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh
index 354be353455fd38f447e1eb29f321b14749b7505..ab8d04855af5c68303b858ba63733f146aedb914 100755 (executable)
--- a/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh
+++ b/tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh
@@ -100,8 +100,6 @@ test_stats_rx()
        test_stats g2a rx
 }
 
-skip_on_veth
-
 trap cleanup EXIT
 
 setup_prepare

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index dbd4348f85b8b7c3b35cbbc7b8e0a7cca75ae407..ca433ba3612ee77d06346c56c342943513ce0499 100644 (file)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -254,17 +254,6 @@ check_port_mab_support()
        fi
 }
 
-skip_on_veth()
-{
-       local kind=$(ip -j -d link show dev ${NETIFS[p1]} |
-               jq -r '.[].linkinfo.info_kind')
-
-       if [[ $kind == veth ]]; then
-               echo "SKIP: Test cannot be run with veth pairs"
-               exit $ksft_skip
-       fi
-}
-
 if [[ "$(id -u)" -ne 0 ]]; then
        echo "SKIP: need root privileges"
        exit $ksft_skip