Commit f589234e authored by Matthieu Baerts's avatar Matthieu Baerts Committed by David S. Miller

selftests: mptcp: userspace_pm: format subtests results in TAP

The current selftests infrastructure formats the results in TAP 13. This
version doesn't support subtests and only the end result of each
selftest is taken into account. It means that a single issue in a
subtest of a selftest containing multiple subtests forces the whole
selftest to be marked as failed. It also means that subtests results are
not tracked by CIs executing selftests.

MPTCP selftests run hundreds of various subtests. It is then important
to track each of them and not one result per selftest.

It is particularly interesting to do that when validating stable kernels
with the last version of the test suite: tests might fail because a
feature is not supported but the test didn't skip that part. In this
case, if subtests are not tracked, the whole selftest will be marked as
failed making the other subtests useless because their results are
ignored.

This patch formats subtests results in TAP in userspace_pm.sh selftest.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e86a297
...@@ -59,6 +59,8 @@ rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX) ...@@ -59,6 +59,8 @@ rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX)
ns1="ns1-$rndh" ns1="ns1-$rndh"
ns2="ns2-$rndh" ns2="ns2-$rndh"
ret=0 ret=0
test_name=""
_printf() { _printf() {
stdbuf -o0 -e0 printf "${@}" stdbuf -o0 -e0 printf "${@}"
} }
...@@ -71,7 +73,9 @@ print_title() ...@@ -71,7 +73,9 @@ print_title()
# $1: test name # $1: test name
print_test() print_test()
{ {
_printf "%-63s" "${1}" test_name="${1}"
_printf "%-63s" "${test_name}"
} }
print_results() print_results()
...@@ -82,11 +86,13 @@ print_results() ...@@ -82,11 +86,13 @@ print_results()
test_pass() test_pass()
{ {
print_results " OK " print_results " OK "
mptcp_lib_result_pass "${test_name}"
} }
test_skip() test_skip()
{ {
print_results "SKIP" print_results "SKIP"
mptcp_lib_result_skip "${test_name}"
} }
# $1: msg # $1: msg
...@@ -98,6 +104,8 @@ test_fail() ...@@ -98,6 +104,8 @@ test_fail()
if [ -n "${1}" ]; then if [ -n "${1}" ]; then
_printf "\t%s\n" "${1}" _printf "\t%s\n" "${1}"
fi fi
mptcp_lib_result_fail "${test_name}"
} }
kill_wait() kill_wait()
...@@ -255,6 +263,7 @@ make_connection() ...@@ -255,6 +263,7 @@ make_connection()
test_pass test_pass
else else
test_fail "Expected tokens (c:${client_token} - s:${server_token}) and server (c:${client_serverside} - s:${server_serverside})" test_fail "Expected tokens (c:${client_token} - s:${server_token}) and server (c:${client_serverside} - s:${server_serverside})"
mptcp_lib_result_print_all_tap
exit 1 exit 1
fi fi
...@@ -990,4 +999,5 @@ test_subflows_v4_v6_mix ...@@ -990,4 +999,5 @@ test_subflows_v4_v6_mix
test_prio test_prio
test_listener test_listener
mptcp_lib_result_print_all_tap
exit ${ret} exit ${ret}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment