From: Geliang Tang <tanggeliang@kylinos.cn>
Refine test output to print detailed titles for SOL_MPTCP socket option
tests in both IPv4 and IPv6 contexts. This enhances readability and
distinctly separates v4/v6 results. The output now explicitly labels
each test phase and result, making failures easier to identify.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
.../selftests/net/mptcp/mptcp_sockopt.sh | 27 +++++++++++++------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 418a903c3a4d..003d218defa8 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -261,28 +261,37 @@ do_mptcp_sockopt_tests()
ip netns exec "$ns_sbox" ./mptcp_sockopt
lret=$?
- print_title "SOL_MPTCP sockopt v4"
+ mptcp_lib_print_info "sockopt v4"
if [ $lret -ne 0 ]; then
- mptcp_lib_pr_fail
+ mptcp_lib_pr_fail "sockopt v4"
mptcp_lib_result_fail "sockopt v4"
ret=$lret
return
fi
- mptcp_lib_pr_ok
- mptcp_lib_result_pass "sockopt v4"
+
+ for opt in "SOL_MPTCP"; do
+ print_title "$opt sockopt v4"
+ mptcp_lib_pr_ok
+ mptcp_lib_result_pass "$opt sockopt v4"
+ done
ip netns exec "$ns_sbox" ./mptcp_sockopt -6
lret=$?
- print_title "SOL_MPTCP sockopt v6"
+ mptcp_lib_print_info "sockopt v6"
if [ $lret -ne 0 ]; then
- mptcp_lib_pr_fail
+ mptcp_lib_pr_fail "sockopt v6"
mptcp_lib_result_fail "sockopt v6"
ret=$lret
return
fi
- mptcp_lib_pr_ok
- mptcp_lib_result_pass "sockopt v6"
+
+ for opt in "SOL_MPTCP"; do
+ print_title "$opt sockopt v6"
+ mptcp_lib_pr_ok
+ mptcp_lib_result_pass "$opt sockopt v6"
+ done
+
}
run_tests()
@@ -329,6 +338,8 @@ do_tcpinq_tests()
return
fi
+ mptcp_lib_print_info "sockopt TCP_INQ"
+
local args
for args in "-t tcp" "-r tcp"; do
do_tcpinq_test $args
--
2.48.1