]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftest: packetdrill: Set ktap_set_plan properly for single protocol test.
authorKuniyuki Iwashima <kuniyu@google.com>
Sat, 27 Sep 2025 21:29:39 +0000 (21:29 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 30 Sep 2025 01:41:06 +0000 (18:41 -0700)
The cited commit forgot to update the ktap_set_plan call.

ktap_set_plan sets the number of tests (KSFT_NUM_TESTS), which must
match the number of executed tests (KTAP_CNT_PASS + KTAP_CNT_SKIP +
KTAP_CNT_XFAIL) in ktap_finished.

Otherwise, the selftest exit()s with 1.

Let's adjust KSFT_NUM_TESTS based on supported protocols.

While at it, misalignment is fixed up.

Fixes: a5c10aa3d1ba ("selftests/net: packetdrill: Support single protocol test.")
Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20250927213022.1850048-2-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/packetdrill/ksft_runner.sh

index 0ae6eeeb1a8eb493657b2ee6c190d96110192834..3fa7c7f66caf4e4b5ded27c4744649f2b21ee59b 100755 (executable)
@@ -48,11 +48,11 @@ elif [[ ! "$ip_versions" =~ ^ipv[46]$ ]]; then
 fi
 
 ktap_print_header
-ktap_set_plan 2
+ktap_set_plan $(echo $ip_versions | wc -w)
 
 for ip_version in $ip_versions; do
        unshare -n packetdrill ${ip_args[$ip_version]} ${optargs[@]} $script > /dev/null \
-           && ktap_test_pass $ip_version || $failfunc $ip_version
+               && ktap_test_pass $ip_version || $failfunc $ip_version
 done
 
 ktap_finished