iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: mptcp: print all error messages to stdout

Browse Source 
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: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu 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: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Geliang Tang 2024-03-08 23:10:08 +01:00 committed by Jakub Kicinski
parent 0d1a7a8fac
commit 6215df11b9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/testing/selftests/net/mptcp/mptcp_connect.sh
View File

@ -294,7 +294,7 @@ do_ping()
ip netns exec ${connector_ns} ping ${ping_args} $connect_addr >/dev/null || rc=1 ip netns exec ${connector_ns} ping ${ping_args} $connect_addr >/dev/null || rc=1
if [ $rc -ne 0 ] ; then if [ $rc -ne 0 ] ; then
echo "$listener_ns -> $connect_addr connectivity [ FAIL ]" 1>&2 echo "$listener_ns -> $connect_addr connectivity [ FAIL ]"
ret=1 ret=1
return 1 return 1
@ -470,13 +470,13 @@ do_transfer()
if [ ${stat_synrx_now_l} -lt ${expect_synrx} ]; then if [ ${stat_synrx_now_l} -lt ${expect_synrx} ]; then
printf "[ FAIL ] lower MPC SYN rx (%d) than expected (%d)\n" \ 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 retc=1
fi fi
if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ] && [ ${stat_ooo_now} -eq 0 ]; then if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ] && [ ${stat_ooo_now} -eq 0 ]; then
if [ ${stat_ooo_now} -eq 0 ]; then if [ ${stat_ooo_now} -eq 0 ]; then
printf "[ FAIL ] lower MPC ACK rx (%d) than expected (%d)\n" \ 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 rets=1
else else
printf "[ Note ] fallback due to TCP OoO" printf "[ Note ] fallback due to TCP OoO"
@ -721,7 +721,7 @@ EOF
ip -net "$listener_ns" route del local $local_addr/0 dev lo table 100 ip -net "$listener_ns" route del local $local_addr/0 dev lo table 100
if [ $lret -ne 0 ]; then if [ $lret -ne 0 ]; then
echo "FAIL: $msg, mptcp connection error" 1>&2 echo "FAIL: $msg, mptcp connection error"
ret=$lret ret=$lret
return 1 return 1
fi fi
@ -810,7 +810,7 @@ log_if_error()
local msg="$1" local msg="$1"
if [ ${ret} -ne 0 ]; then if [ ${ret} -ne 0 ]; then
echo "FAIL: ${msg}" 1>&2 echo "FAIL: ${msg}"
final_ret=${ret} final_ret=${ret}
ret=0 ret=0

11
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
View File

@ -103,7 +103,8 @@ check_mark()
local v local v
for v in $values; do for v in $values; do
if [ $v -ne 0 ]; then 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 ret=1
return 1 return 1
fi fi
@ -162,7 +163,7 @@ do_transfer()
local rets=$? local rets=$?
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then 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 echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2
ip netns exec ${listener_ns} ss -Menita 1>&2 -o "sport = :$port" ip netns exec ${listener_ns} ss -Menita 1>&2 -o "sport = :$port"
@ -221,7 +222,7 @@ do_mptcp_sockopt_tests()
lret=$? lret=$?
if [ $lret -ne 0 ]; then if [ $lret -ne 0 ]; then
echo "FAIL: SOL_MPTCP getsockopt" 1>&2 echo "FAIL: SOL_MPTCP getsockopt"
mptcp_lib_result_fail "sockopt v4" mptcp_lib_result_fail "sockopt v4"
ret=$lret ret=$lret
return return
@ -232,7 +233,7 @@ do_mptcp_sockopt_tests()
lret=$? lret=$?
if [ $lret -ne 0 ]; then 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" mptcp_lib_result_fail "sockopt v6"
ret=$lret ret=$lret
return return
@ -263,7 +264,7 @@ do_tcpinq_test()
local lret=$? local lret=$?
if [ $lret -ne 0 ];then if [ $lret -ne 0 ];then
ret=$lret ret=$lret
echo "FAIL: mptcp_inq $*" 1>&2 echo "FAIL: mptcp_inq $*"
mptcp_lib_result_fail "TCP_INQ: $*" mptcp_lib_result_fail "TCP_INQ: $*"
return $lret return $lret
fi fi