OSDN Git Service

selftests: mptcp: pm_netlink: format subtests results in TAP
authorMatthieu Baerts <matthieu.baerts@tessares.net>
Mon, 17 Jul 2023 13:21:28 +0000 (15:21 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jul 2023 10:10:52 +0000 (11:10 +0100)
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 pm_netlink.sh selftest.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
tools/testing/selftests/net/mptcp/pm_netlink.sh

index d02e0d6..f32038f 100755 (executable)
@@ -58,16 +58,19 @@ check()
        local out=`$cmd 2>$err`
        local cmd_ret=$?
 
-       printf "%-50s %s" "$msg"
+       printf "%-50s" "$msg"
        if [ $cmd_ret -ne 0 ]; then
                echo "[FAIL] command execution '$cmd' stderr "
                cat $err
+               mptcp_lib_result_fail "${msg} # error ${cmd_ret}"
                ret=1
        elif [ "$out" = "$expected" ]; then
                echo "[ OK ]"
+               mptcp_lib_result_pass "${msg}"
        else
                echo -n "[FAIL] "
                echo "expected '$expected' got '$out'"
+               mptcp_lib_result_fail "${msg} # different output"
                ret=1
        fi
 }
@@ -193,4 +196,5 @@ subflow 10.0.1.1" "          (nofullmesh)"
 subflow,backup,fullmesh 10.0.1.1" "          (backup,fullmesh)"
 fi
 
+mptcp_lib_result_print_all_tap
 exit $ret