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

selftests: mptcp: sockopt: 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 mptcp_sockopt.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 675d9933

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

+18 −2
Original line number Diff line number Diff line
@@ -183,11 +183,13 @@ do_transfer() 


	local mptcp_connect="./mptcp_connect -r 20"



	local local_addr

	local local_addr ip

	if is_v6 "${connect_addr}"; then

		local_addr="::"

		ip=ipv6

	else

		local_addr="0.0.0.0"

		ip=ipv4

	fi



	cmsg="TIMESTAMPNS"
@@ -223,6 +225,8 @@ do_transfer() 
		echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2

		ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport = :$port"



		mptcp_lib_result_fail "transfer ${ip}"



		ret=1

		return 1

	fi
@@ -236,9 +240,11 @@ do_transfer() 
	fi



	check_transfer $cin $sout "file received by server"



	rets=$?



	mptcp_lib_result_code "${retc}" "mark ${ip}"

	mptcp_lib_result_code "${rets}" "transfer ${ip}"



	if [ $retc -eq 0 ] && [ $rets -eq 0 ];then

		return 0

	fi
@@ -264,6 +270,7 @@ do_mptcp_sockopt_tests() 


	if ! mptcp_lib_kallsyms_has "mptcp_diag_fill_info$"; then

		echo "INFO: MPTCP sockopt not supported: SKIP"

		mptcp_lib_result_skip "sockopt"

		return

	fi
@@ -272,18 +279,22 @@ do_mptcp_sockopt_tests() 


	if [ $lret -ne 0 ]; then

		echo "FAIL: SOL_MPTCP getsockopt" 1>&2

		mptcp_lib_result_fail "sockopt v4"

		ret=$lret

		return

	fi

	mptcp_lib_result_pass "sockopt v4"



	ip netns exec "$ns_sbox" ./mptcp_sockopt -6

	lret=$?



	if [ $lret -ne 0 ]; then

		echo "FAIL: SOL_MPTCP getsockopt (ipv6)" 1>&2

		mptcp_lib_result_fail "sockopt v6"

		ret=$lret

		return

	fi

	mptcp_lib_result_pass "sockopt v6"

}



run_tests()
@@ -310,10 +321,12 @@ do_tcpinq_test() 
	if [ $lret -ne 0 ];then

		ret=$lret

		echo "FAIL: mptcp_inq $@" 1>&2

		mptcp_lib_result_fail "TCP_INQ: $*"

		return $lret

	fi



	echo "PASS: TCP_INQ cmsg/ioctl $@"

	mptcp_lib_result_pass "TCP_INQ: $*"

	return $lret

}
@@ -323,6 +336,7 @@ do_tcpinq_tests() 


	if ! mptcp_lib_kallsyms_has "mptcp_ioctl$"; then

		echo "INFO: TCP_INQ not supported: SKIP"

		mptcp_lib_result_skip "TCP_INQ"

		return

	fi
@@ -367,4 +381,6 @@ if [ $ret -eq 0 ];then 
fi



do_tcpinq_tests



mptcp_lib_result_print_all_tap

exit $ret