Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Petr Machata and committed by
Jakub Kicinski
0c499a35 40d269c0

+4 -29
-2
tools/testing/selftests/drivers/net/hw/ethtool.sh
··· 287 287 ethtool -s $h1 autoneg on 288 288 } 289 289 290 - skip_on_veth 291 - 292 290 trap cleanup EXIT 293 291 294 292 setup_prepare
-2
tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh
··· 109 109 ip link set dev $swp3 down 110 110 } 111 111 112 - skip_on_veth 113 - 114 112 setup_prepare 115 113 116 114 tests_run
+4 -12
tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh
··· 325 325 326 326 used=$(ip -j stats show dev $rp1.200 group offload subgroup hw_stats_info | 327 327 jq '.[].info.l3_stats.used') 328 - kind=$(ip -j -d link show dev $rp1 | 329 - jq -r '.[].linkinfo.info_kind') 330 - if [[ $used != true ]]; then 331 - if [[ $kind == veth ]]; then 332 - log_test_skip "l3_stats not offloaded on veth interface" 333 - EXIT_STATUS=$ksft_skip 334 - else 335 - RET=1 log_test "l3_stats not offloaded" 336 - fi 337 - else 338 - tests_run 339 - fi 328 + [[ $used = true ]] 329 + check_err $? "hw_stats_info.used=$used" 330 + log_test "l3_stats offloaded" 331 + tests_run 340 332 341 333 exit $EXIT_STATUS
-2
tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh
··· 100 100 test_stats g2a rx 101 101 } 102 102 103 - skip_on_veth 104 - 105 103 trap cleanup EXIT 106 104 107 105 setup_prepare
-11
tools/testing/selftests/net/forwarding/lib.sh
··· 254 254 fi 255 255 } 256 256 257 - skip_on_veth() 258 - { 259 - local kind=$(ip -j -d link show dev ${NETIFS[p1]} | 260 - jq -r '.[].linkinfo.info_kind') 261 - 262 - if [[ $kind == veth ]]; then 263 - echo "SKIP: Test cannot be run with veth pairs" 264 - exit $ksft_skip 265 - fi 266 - } 267 - 268 257 if [[ "$(id -u)" -ne 0 ]]; then 269 258 echo "SKIP: need root privileges" 270 259 exit $ksft_skip