]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests: mptcp: interpret \n as a new line
authorMatthieu Baerts <matthieu.baerts@tessares.net>
Wed, 16 Sep 2020 13:13:51 +0000 (15:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:40 +0000 (10:07 +0100)
[ Upstream commit 8b974778f998ab1be23eca7436fc13d2d8c6bd59 ]

In case of errors, this message was printed:

  (...)
  # read: Resource temporarily unavailable
  #  client exit code 0, server 3
  # \nnetns ns1-0-BJlt5D socket stat for 10003:
  (...)

Obviously, the idea was to add a new line before the socket stat and not
print "\nnetns".

Fixes: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN")
Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp")
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/net/mptcp/mptcp_connect.sh
tools/testing/selftests/net/mptcp/mptcp_join.sh

index acf02e156d20f0b82461a2d323821771692c5bf4..ed163e4ad434426edcec49dcefae99010a947cbd 100755 (executable)
@@ -421,9 +421,9 @@ do_transfer()
        duration=$(printf "(duration %05sms)" $duration)
        if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
                echo "$duration [ FAIL ] client exit code $retc, server $rets" 1>&2
-               echo "\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 -nita 1>&2 -o "sport = :$port"
-               echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2
+               echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2
                ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port"
 
                cat "$capout"
index dd42c2f692d017aa3f5d8a1b4e0753a6a7f1836a..9cb0c6af326ba5fb3c835f241e1d1dcf558d42be 100755 (executable)
@@ -167,9 +167,9 @@ do_transfer()
 
        if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
                echo " client exit code $retc, server $rets" 1>&2
-               echo "\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 -nita 1>&2 -o "sport = :$port"
-               echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2
+               echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2
                ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port"
 
                cat "$capout"