With commit a6e263f125cd ("selftests: net: lib: Introduce deferred commands") tests_run() already runs every test in its own defer scope. So the per-test in_defer_scope here does not do anything. Drop the in_defer_scope calls and the wrappers that only exist for that. Suggested-by: Petr Machata Link: https://lore.kernel.org/all/875wyo6b7d.fsf@pmachata.org/ Signed-off-by: Hannes Laimer --- .../selftests/net/forwarding/vxlan_reserved.sh | 39 +++++----------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh index 0ce264cc57f8..a273e1fcd26c 100755 --- a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh +++ b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh @@ -273,30 +273,18 @@ __default_test_do() log_test "$what: drops reported" } -default_test_do() +default_test() { vxlan_device_add __default_test_do 0 "Default" } -default_test() -{ - in_defer_scope \ - default_test_do -} - -plain_test_do() +plain_test() { vxlan_device_add reserved_bits 0xf7ffffff000000ff __default_test_do 0 "reserved_bits 0xf7ffffff000000ff" } -plain_test() -{ - in_defer_scope \ - plain_test_do -} - reserved_test() { local bit=$1; shift @@ -311,35 +299,30 @@ reserved_test() reserved_0_test() { - in_defer_scope \ - reserved_test 0 + reserved_test 0 } reserved_10_test() { - in_defer_scope \ - reserved_test 10 + reserved_test 10 } reserved_31_test() { - in_defer_scope \ - reserved_test 31 + reserved_test 31 } reserved_56_test() { - in_defer_scope \ - reserved_test 56 + reserved_test 56 } reserved_63_test() { - in_defer_scope \ - reserved_test 63 + reserved_test 63 } -gbp_changelink_test_do() +gbp_changelink_test() { vxlan_device_add gbp __default_test_do 25 "gbp" @@ -347,12 +330,6 @@ gbp_changelink_test_do() __default_test_do 25 "gbp after changelink" } -gbp_changelink_test() -{ - in_defer_scope \ - gbp_changelink_test_do -} - trap cleanup EXIT setup_prepare --- base-commit: 6db9448a443afde26231aaed7b112ed17b33f468 change-id: 20261026-vxlan-reserved-tests-f2ceea83bb0c Best regards, -- Hannes Laimer