selftests: mptcp: connect: remove duplicated spaces in TAP output

It is nice to have a visual alignment in the test output to present the
different results, but it makes less sense in the TAP output that is
there for computers.

It sounds then better to remove the duplicated whitespaces in the TAP
output, also because it can cause some issues with TAP parsers expecting
only one space around the directive delimiter (#).

While at it, change the variable name (result_msg) to something more
explicit.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240906-net-next-mptcp-ksft-subtest-time-v2-5-31d5ee4f3bdf@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 49d90c4dbc01f99d03e3882f23a3fad6c7a289e7..57325d57e4c6e3653019db2de09620d692143683 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -345,9 +345,11 @@ do_transfer()
 
        local addr_port
        addr_port=$(printf "%s:%d" ${connect_addr} ${port})
-       local result_msg
-       result_msg="$(printf "%.3s %-5s -> %.3s (%-20s) %-5s" ${connector_ns} ${cl_proto} ${listener_ns} ${addr_port} ${srv_proto})"
-       mptcp_lib_print_title "${result_msg}"
+       local pretty_title
+       pretty_title="$(printf "%.3s %-5s -> %.3s (%-20s) %-5s" ${connector_ns} ${cl_proto} ${listener_ns} ${addr_port} ${srv_proto})"
+       mptcp_lib_print_title "${pretty_title}"
+
+       local tap_title="${connector_ns:0:3} ${cl_proto} -> ${listener_ns:0:3} (${addr_port}) ${srv_proto}"
 
        if $capture; then
                local capuser
@@ -443,7 +445,7 @@ do_transfer()
 
                echo
                cat "$capout"
-               mptcp_lib_result_fail "${TEST_GROUP}: ${result_msg}"
+               mptcp_lib_result_fail "${TEST_GROUP}: ${tap_title}"
                return 1
        fi
 
@@ -543,12 +545,12 @@ do_transfer()
 
        if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then
                mptcp_lib_pr_ok "${extra:1}"
-               mptcp_lib_result_pass "${TEST_GROUP}: ${result_msg}"
+               mptcp_lib_result_pass "${TEST_GROUP}: ${tap_title}"
        else
                if [ -n "${extra}" ]; then
                        mptcp_lib_print_warn "${extra:1}"
                fi
-               mptcp_lib_result_fail "${TEST_GROUP}: ${result_msg}"
+               mptcp_lib_result_fail "${TEST_GROUP}: ${tap_title}"
        fi
 
        cat "$capout"