Commit ce990257 authored by Matthieu Baerts's avatar Matthieu Baerts Committed by David S. Miller
Browse files

selftests: mptcp: diag: 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 diag.sh selftest.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368


Acked-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 7f117cd3

tools/testing/selftests/net/mptcp/diag.sh

+7 −0
Original line number Diff line number Diff line
@@ -65,12 +65,15 @@ __chk_nr() 
	if [ $nr != $expected ]; then

		if [ $nr = "$skip" ] && ! mptcp_lib_expect_all_features; then

			echo "[ skip ] Feature probably not supported"

			mptcp_lib_result_skip "${msg}"

		else

			echo "[ fail ] expected $expected found $nr"

			mptcp_lib_result_fail "${msg}"

			ret=$test_cnt

		fi

	else

		echo "[  ok  ]"

		mptcp_lib_result_pass "${msg}"

	fi

	test_cnt=$((test_cnt+1))

}
@@ -111,12 +114,15 @@ wait_msk_nr() 
	printf "%-50s" "$msg"

	if [ $i -ge $timeout ]; then

		echo "[ fail ] timeout while expecting $expected max $max last $nr"

		mptcp_lib_result_fail "${msg} # timeout"

		ret=$test_cnt

	elif [ $nr != $expected ]; then

		echo "[ fail ] expected $expected found $nr"

		mptcp_lib_result_fail "${msg} # unexpected result"

		ret=$test_cnt

	else

		echo "[  ok  ]"

		mptcp_lib_result_pass "${msg}"

	fi

	test_cnt=$((test_cnt+1))

}
@@ -276,4 +282,5 @@ flush_pids 


chk_msk_inuse 0 "....chk 0 msk in use after flush"



mptcp_lib_result_print_all_tap

exit $ret