Commit fc93331a authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

selftests: mptcp: print all error messages to stdout 

mainline inclusion
from mainline-v6.9-rc1
commit 6215df11b94556735192b7b488ee98611a9feb12
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=6215df11b94556735192b7b488ee98611a9feb12



--------------------------------

Some error messages are printed to stderr while the others are printed
to 'stdout'. As part of the unification, this patch drop "1>&2" to let
all errors messages are printed to 'stdout'.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-1-4f42c347b653@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 01788ca1

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

+5 −5
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ do_ping() 
	ip netns exec ${connector_ns} ping ${ping_args} $connect_addr >/dev/null || rc=1



	if [ $rc -ne 0 ] ; then

		echo "$listener_ns -> $connect_addr connectivity [ FAIL ]" 1>&2

		echo "$listener_ns -> $connect_addr connectivity [ FAIL ]"

		ret=1



		return 1
@@ -475,13 +475,13 @@ do_transfer() 


	if [ ${stat_synrx_now_l} -lt ${expect_synrx} ]; then

		printf "[ FAIL ] lower MPC SYN rx (%d) than expected (%d)\n" \

			"${stat_synrx_now_l}" "${expect_synrx}" 1>&2

			"${stat_synrx_now_l}" "${expect_synrx}"

		retc=1

	fi

	if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ] && [ ${stat_ooo_now} -eq 0 ]; then

		if [ ${stat_ooo_now} -eq 0 ]; then

			printf "[ FAIL ] lower MPC ACK rx (%d) than expected (%d)\n" \

				"${stat_ackrx_now_l}" "${expect_ackrx}" 1>&2

				"${stat_ackrx_now_l}" "${expect_ackrx}"

			rets=1

		else

			extra+=" [ Note ] fallback due to TCP OoO"
@@ -733,7 +733,7 @@ EOF 
	ip -net "$listener_ns" route del local $local_addr/0 dev lo table 100



	if [ $lret -ne 0 ]; then

		echo "FAIL: $msg, mptcp connection error" 1>&2

		echo "FAIL: $msg, mptcp connection error"

		ret=$lret

		return 1

	fi
@@ -822,7 +822,7 @@ log_if_error() 
	local msg="$1"



	if [ ${ret} -ne 0 ]; then

		echo "FAIL: ${msg}" 1>&2

		echo "FAIL: ${msg}"



		final_ret=${ret}

		ret=0

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

+6 −5
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ check_mark() 
	local v

	for v in $values; do

		if [ $v -ne 0 ]; then

			echo "FAIL: got $tables $values in ns $ns , not 0 - not all expected packets marked" 1>&2

			echo "FAIL: got $tables $values in ns $ns," \

			     "not 0 - not all expected packets marked"

			ret=1

			return 1

		fi
@@ -162,7 +163,7 @@ do_transfer() 
	local rets=$?



	if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then

		echo " client exit code $retc, server $rets" 1>&2

		echo " client exit code $retc, server $rets"

		echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2

		ip netns exec ${listener_ns} ss -Menita 1>&2 -o "sport = :$port"
@@ -221,7 +222,7 @@ do_mptcp_sockopt_tests() 
	lret=$?



	if [ $lret -ne 0 ]; then

		echo "FAIL: SOL_MPTCP getsockopt" 1>&2

		echo "FAIL: SOL_MPTCP getsockopt"

		mptcp_lib_result_fail "sockopt v4"

		ret=$lret

		return
@@ -232,7 +233,7 @@ do_mptcp_sockopt_tests() 
	lret=$?



	if [ $lret -ne 0 ]; then

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

		echo "FAIL: SOL_MPTCP getsockopt (ipv6)"

		mptcp_lib_result_fail "sockopt v6"

		ret=$lret

		return
@@ -263,7 +264,7 @@ do_tcpinq_test() 
	local lret=$?

	if [ $lret -ne 0 ];then

		ret=$lret

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

		echo "FAIL: mptcp_inq $*"

		mptcp_lib_result_fail "TCP_INQ: $*"

		return $lret

	fi