From nobody Mon Feb 9 17:07:07 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29F7DEDC for ; Sun, 3 Mar 2024 09:53:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709459599; cv=none; b=cl2XZsTDEv1MvmT5vhkaeP7XBiPjG3G+j5GdhHwMyEgjFXpyvxBQ2OIAyaa3lB4mIL30jSTBanqbtRb6HnYTK6qvWWnW/88WmqsN+FBnHyqzjCHRdwk7w6+zHMD90Pg5W6BiD8UJh7hvhBKUFy5IIkNlIWRw3JECdjLv75umcL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709459599; c=relaxed/simple; bh=POK6HyvhsACvrS8L/c1QUhHc/4CLukJs44NtSP+v52c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sxH13wX3Mvi8Kbo1mIk515sp3R3XRd4IBphixuWrHyMXXQI4FBn/2Z1M+Le0hx+4oQzxVQxlz+AwhBdyZzcxZr71vE6IjedPY4wdH4+REMkY0k0hcliVVJTcmUG2A2Pz5ks7R0bhnhuiFSLHrDYa2SVTmydGvOw4TQUnERaz6Ys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YRq1Q3ig; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YRq1Q3ig" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 282B8C433C7; Sun, 3 Mar 2024 09:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709459599; bh=POK6HyvhsACvrS8L/c1QUhHc/4CLukJs44NtSP+v52c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRq1Q3ig0VtpL8xwATMxutFhxhIajjtWVxfY+q3tpPiFwG9SkkNx6EkRRM1As4Kc5 RCw0PelYMzLH3tGTRmpROk8W21jWHWxDN2n0yAppeyjQp3TCj9TAeZNhiKwU3ovu3K z8bkvrPG75ObEICrvQ5lAcvF+k9qcx+5Wh2w4dFvvQrpxPpme+3CXkv8WDjDeYUHGG oEHKt5M6smRIn0ym5g3LQLuYKv9YHbINFp60CQGLsBxn4xvmi+6WreG9s9DxVQ5kDJ d6/8hDaJpGzNv6jsieEveoI4CF+xa231jYJx+wAyTy5DAnOqODOLgNt+OiwA1Bliy7 IpPP8kIzH0KEA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 4/8] selftests: mptcp: sockopt: print every test result Date: Sun, 3 Mar 2024 17:52:24 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Only total test results are printed out in mptcp_sockopt.sh: PASS: all packets had packet mark set PASS: SOL_MPTCP getsockopt has expected information PASS: TCP_INQ cmsg/ioctl -t tcp PASS: TCP_INQ cmsg/ioctl -6 -t tcp PASS: TCP_INQ cmsg/ioctl -r tcp PASS: TCP_INQ cmsg/ioctl -6 -r tcp PASS: TCP_INQ cmsg/ioctl -r tcp -t tcp They mismatch with the test results: ok 1 - mptcp_sockopt: mark ipv4 ok 2 - mptcp_sockopt: transfer ipv4 ok 3 - mptcp_sockopt: mark ipv6 ok 4 - mptcp_sockopt: transfer ipv6 ok 5 - mptcp_sockopt: sockopt v4 ok 6 - mptcp_sockopt: sockopt v6 ok 7 - mptcp_sockopt: TCP_INQ: -t tcp ok 8 - mptcp_sockopt: TCP_INQ: -6 -t tcp ok 9 - mptcp_sockopt: TCP_INQ: -r tcp ok 10 - mptcp_sockopt: TCP_INQ: -6 -r tcp ok 11 - mptcp_sockopt: TCP_INQ: -r tcp -t tcp 'mptcp_sockopt.sh' now display more detailed results + why (what you had in a former patch from v6, merged here). It no longer displays 'PASS:', because it is duplicated info now that the detailed are displayed: Transfer v4 [ OK ] Mark v4 [ OK ] Transfer v6 [ OK ] Mark v6 [ OK ] SOL_MPTCP sockopt v4 [ OK ] SOL_MPTCP sockopt v6 [ OK ] TCP_INQ cmsg/ioctl -t tcp [ OK ] TCP_INQ cmsg/ioctl -6 -t tcp [ OK ] TCP_INQ cmsg/ioctl -r tcp [ OK ] TCP_INQ cmsg/ioctl -6 -r tcp [ OK ] TCP_INQ cmsg/ioctl -r tcp -t tcp [ OK ] Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.sh | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index bf22174c022c..f7f643779992 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -113,6 +113,11 @@ check_mark() return 0 } =20 +print_title() +{ + printf "%-50s" "${@}" +} + do_transfer() { local listener_ns=3D"$1" @@ -162,6 +167,7 @@ do_transfer() wait $spid local rets=3D$? =20 + print_title "Transfer ${ip:2}" if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then echo " client exit code $retc, server $rets" 1>&2 echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2 @@ -175,7 +181,9 @@ do_transfer() ret=3D1 return 1 fi + echo "[ OK ]" =20 + print_title "Mark ${ip:2}" if [ $local_addr =3D "::" ];then check_mark $listener_ns 6 || retc=3D1 check_mark $connector_ns 6 || retc=3D1 @@ -191,8 +199,10 @@ do_transfer() mptcp_lib_result_code "${rets}" "transfer ${ip}" =20 if [ $retc -eq 0 ] && [ $rets -eq 0 ];then + echo "[ OK ]" return 0 fi + echo "[FAIL]" =20 return 1 } @@ -221,23 +231,27 @@ do_mptcp_sockopt_tests() ip netns exec "$ns_sbox" ./mptcp_sockopt lret=3D$? =20 + print_title "SOL_MPTCP sockopt v4" if [ $lret -ne 0 ]; then - echo "FAIL: SOL_MPTCP getsockopt" + echo "[FAIL]" mptcp_lib_result_fail "sockopt v4" ret=3D$lret return fi + echo "[ OK ]" mptcp_lib_result_pass "sockopt v4" =20 ip netns exec "$ns_sbox" ./mptcp_sockopt -6 lret=3D$? =20 + print_title "SOL_MPTCP sockopt v6" if [ $lret -ne 0 ]; then - echo "FAIL: SOL_MPTCP getsockopt (ipv6)" + echo "[FAIL]" mptcp_lib_result_fail "sockopt v6" ret=3D$lret return fi + echo "[ OK ]" mptcp_lib_result_pass "sockopt v6" } =20 @@ -260,16 +274,17 @@ run_tests() =20 do_tcpinq_test() { + print_title "TCP_INQ cmsg/ioctl $*" ip netns exec "$ns_sbox" ./mptcp_inq "$@" local lret=3D$? if [ $lret -ne 0 ];then ret=3D$lret - echo "FAIL: mptcp_inq $*" + echo "[FAIL]" mptcp_lib_result_fail "TCP_INQ: $*" return $lret fi =20 - echo "PASS: TCP_INQ cmsg/ioctl $*" + echo "[ OK ]" mptcp_lib_result_pass "TCP_INQ: $*" return $lret } @@ -315,15 +330,7 @@ trap cleanup EXIT run_tests $ns1 $ns2 10.0.1.1 run_tests $ns1 $ns2 dead:beef:1::1 =20 -if [ $ret -eq 0 ];then - echo "PASS: all packets had packet mark set" -fi - do_mptcp_sockopt_tests -if [ $ret -eq 0 ];then - echo "PASS: SOL_MPTCP getsockopt has expected information" -fi - do_tcpinq_tests =20 mptcp_lib_result_print_all_tap --=20 2.40.1