From nobody Mon Feb 9 19:55:40 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 F0DD0BA5F for ; Fri, 23 Feb 2024 03:08:20 +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=1708657701; cv=none; b=RDrvWYRQrhTG89TFYz4QNvvQmOkkk+e94YJDnK9L18MZkc1Z41O910zIZwrF19TeXrbNwVhdWz17H0GZ3xqz9iqz4FSxz68qXk/09rPYIm2t8jBjr82jlhx87ACKcGuiGAJB7I6km/vg8iojFKoswgqB42CyhLRlEG+4jZKuGwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708657701; c=relaxed/simple; bh=fViUuPuEwA8F1udbEi8zrR/I6QkOdpE0KJxYUruslKk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Okfhoh+eBo6hlPqw6doI7J0yfv2kKNAeorHJkBB0jLzXwdAWIIYPsZTGDPVj5unJZS6peNLSNUSMqgNRlX6LYhAqDmNotCKOWHn3SvVZ1xc8S0RG+o1W+q7AS9Kg/NYo5ewo4BFBtVV2/+KJMzNBdqfjhONGEvwguk6hrlUy8eQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rC0J8Xk8; 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="rC0J8Xk8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FF99C43394; Fri, 23 Feb 2024 03:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708657700; bh=fViUuPuEwA8F1udbEi8zrR/I6QkOdpE0KJxYUruslKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rC0J8Xk8kNl6rJUd1+iQrPbeMzxnpXOQDtFHXHQzVutWwX8e73EAKvcNF6hXvno/S mY1GKBh5P4Iobm38Tm/IBStVFzKXibei2fHUhVDHshSvnRHzM/FJb5OJ12Kj/YhCnQ ChDwjubEJbrwWzh+9Kr8zaZq88HSbkK8dAvxSsXjD219no1QmEAWZsxcvJn8fhLNSS HqvkjGy0L9X3ZdaczKnG3suAuNZQNFStFcH5Q2z8wiKhYURkTIhoIIoBU2iTe97X2p M8ZlPFZzhBWTu7OxRlTZOdBUP1wezhqS/AtvDj7PPZSYkpiWkEDySPeR55KIXg8zFB 1JgXe8M0oZZQw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/8] selftests: mptcp: sockopt: print every test result Date: Fri, 23 Feb 2024 11:08:06 +0800 Message-Id: <4a8261cdc352249351fd4413a5bce46d4933283e.1708657487.git.tanggeliang@kylinos.cn> 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 This patch prints more info for every test result in each test group: transfer ipv4 [ OK ] mark ipv4 [ OK ] transfer ipv6 [ OK ] mark ipv6 [ OK ] PASS: all packets had packet mark set sockopt v4 [ OK ] sockopt v6 [ OK ] PASS: SOL_MPTCP getsockopt has expected information TCP_INQ: -t tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -t tcp TCP_INQ: -6 -t tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -6 -t tcp TCP_INQ: -r tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -r tcp TCP_INQ: -6 -r tcp [ OK ] PASS: TCP_INQ cmsg/ioctl -6 -r tcp TCP_INQ: -r tcp -t tcp [ OK ] Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 6ed4aa32222f..b677fba5a383 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -161,6 +161,7 @@ do_transfer() wait $spid local rets=3D$? =20 + printf "%-25s %35s" "transfer ${ip}" " " 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 @@ -169,12 +170,15 @@ do_transfer() echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2 ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport =3D :$port" =20 + mptcp_lib_print_err "[FAIL]" mptcp_lib_result_fail "transfer ${ip}" =20 ret=3D1 return 1 fi + mptcp_lib_print_ok "[ OK ]" =20 + printf "%-25s %35s" "mark ${ip}" " " if [ $local_addr =3D "::" ];then check_mark $listener_ns 6 || retc=3D1 check_mark $connector_ns 6 || retc=3D1 @@ -190,8 +194,10 @@ do_transfer() mptcp_lib_result_code "${rets}" "transfer ${ip}" =20 if [ $retc -eq 0 ] && [ $rets -eq 0 ];then + mptcp_lib_print_ok "[ OK ]" return 0 fi + mptcp_lib_print_err "[FAIL]" =20 return 1 } @@ -220,23 +226,27 @@ do_mptcp_sockopt_tests() ip netns exec "$ns_sbox" ./mptcp_sockopt lret=3D$? =20 + printf "%-25s %35s" "sockopt v4" " " if [ $lret -ne 0 ]; then echo "FAIL: SOL_MPTCP getsockopt" 1>&2 mptcp_lib_result_fail "sockopt v4" ret=3D$lret return fi + mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "sockopt v4" =20 ip netns exec "$ns_sbox" ./mptcp_sockopt -6 lret=3D$? =20 + printf "%-25s %35s" "sockopt v6" " " if [ $lret -ne 0 ]; then echo "FAIL: SOL_MPTCP getsockopt (ipv6)" 1>&2 mptcp_lib_result_fail "sockopt v6" ret=3D$lret return fi + mptcp_lib_print_ok "[ OK ]" mptcp_lib_result_pass "sockopt v6" } =20 @@ -259,6 +269,7 @@ run_tests() =20 do_tcpinq_test() { + printf "%-25s %35s" "TCP_INQ: $*" " " ip netns exec "$ns_sbox" ./mptcp_inq "$@" local lret=3D$? if [ $lret -ne 0 ];then @@ -267,6 +278,7 @@ do_tcpinq_test() mptcp_lib_result_fail "TCP_INQ: $*" return $lret fi + mptcp_lib_print_ok "[ OK ]" =20 echo "PASS: TCP_INQ cmsg/ioctl $*" mptcp_lib_result_pass "TCP_INQ: $*" --=20 2.40.1