From nobody Mon Feb 9 11:51:13 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 3742B60907 for ; Mon, 26 Feb 2024 09:43:51 +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=1708940631; cv=none; b=V4Ob6418PrhPY/NDW39WUp7YY/GS4WJ+HJrageq8DjjStJvvKoHDwSOYJ8xXD8id/qqxO0l3AHB8/tiue6Q+GoEkphdMIJAsCEu8fG5PoTNqkxb7tdXFh4uiBLfyVcLQ+n8xUY89mJgtulS4AwuZ/GPDY9rayUDaJhmca7TjQec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708940631; c=relaxed/simple; bh=rWgaa/ZgFWNqHCITb9rC65XQLXu4EqIufC6OR0o91jk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=o+I4QlfwU2Lm7u5rY7VmJg0d1/rBxg+kYJjtMVXRYkfvSXBwPy3SvqNuttnMtBUVVD614h0Z9tyrg/IALVcvYW+ylIoN4eKlv8hq/s51ySIha37f5WTh7z/Am3OkMBNgl2DQtBnO3yfF5GkgRPqvht4hgqk42DI+if8+6a8y1Vc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MOVN2KEA; 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="MOVN2KEA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF3FCC433F1; Mon, 26 Feb 2024 09:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708940631; bh=rWgaa/ZgFWNqHCITb9rC65XQLXu4EqIufC6OR0o91jk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MOVN2KEAH0Oh0lN8uWQOv18f/BvMrjz+aG/h+PBPG/dtv05ZU8v184bSlHZCD2s9Z nV0Xw0gaH8trFnylBfmp+paoXzLKiTz2YdFK+FImsDzdEL6JDQxCNNsd+BKB0595WV T/A7EqE7cJvfYtJhvHQNqJTiD16KP9I5W886LGICAiwA7YFMl2/jFJpx8q8PfIgZIA Sz5rfWo4wqrMHmtyCDz3evV3NIQ6YbXE3TEXflD0G/yGW79R4NAFSqrwLllO+f/DrC CxL7WxzcB7Exq6rT7fsc+BY9ACs171GEdgSjYna4mPLHaUw4dtTXjnIRRdbtXqA1Yn eSoJvCX+7mBTg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 12/12] selftests: mptcp: use KSFT_SKIP/KSFT_PASS/KSFT_FAIL Date: Mon, 26 Feb 2024 17:43:23 +0800 Message-Id: <33dcbce2a0b189195d040dfaef55634337fe4aa1.1708939963.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 This patch uses the public var KSFT_SKIP in mptcp_lib.sh instead of ksft_skip, and drop 'ksft_skip=3D4' in mptcp_join.sh. Use KSFT_PASS and KSFT_FAIL macros instead of 0 and 1 after 'exit ' and 'ret=3D' in all scripts: exit 0 -> exit ${KSFT_PASS} exit 1 -> exit ${KSFT_FAIL} ret=3D0 -> ret=3D${KSFT_PASS} ret=3D1 -> ret=3D${KSFT_FAIL} Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.sh | 18 +++++++++--------- .../testing/selftests/net/mptcp/mptcp_join.sh | 13 ++++++------- .../selftests/net/mptcp/mptcp_sockopt.sh | 4 ++-- .../testing/selftests/net/mptcp/pm_netlink.sh | 4 ++-- .../selftests/net/mptcp/simult_flows.sh | 4 ++-- .../selftests/net/mptcp/userspace_pm.sh | 4 ++-- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 00bbe451e50d..f54d80a1d0e4 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -65,14 +65,14 @@ while getopts "$optstring" option;do case "$option" in "h") usage $0 - exit 0 + exit ${KSFT_PASS} ;; "d") if [ $OPTARG -ge 0 ];then tc_delay=3D"$OPTARG" else echo "-d requires numeric argument, got \"$OPTARG\"" 1>&2 - exit 1 + exit ${KSFT_FAIL} fi ;; "e") @@ -96,7 +96,7 @@ while getopts "$optstring" option;do sndbuf=3D"$OPTARG" else echo "-S requires numeric argument, got \"$OPTARG\"" 1>&2 - exit 1 + exit ${KSFT_FAIL} fi ;; "R") @@ -104,7 +104,7 @@ while getopts "$optstring" option;do rcvbuf=3D"$OPTARG" else echo "-R requires numeric argument, got \"$OPTARG\"" 1>&2 - exit 1 + exit ${KSFT_FAIL} fi ;; "m") @@ -121,7 +121,7 @@ while getopts "$optstring" option;do ;; "?") usage $0 - exit 1 + exit ${KSFT_FAIL} ;; esac done @@ -260,7 +260,7 @@ check_mptcp_disabled() "net.mptcp.enabled sysctl is not 1 by default" mptcp_lib_print_err "\t\t\t\t [FAIL]" mptcp_lib_result_fail "net.mptcp.enabled sysctl is not 1 by default" - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi ip netns exec ${disabled_ns} sysctl -q net.mptcp.enabled=3D0 @@ -275,7 +275,7 @@ check_mptcp_disabled() "New MPTCP socket cannot be blocked via sysctl" mptcp_lib_print_err "\t\t\t\t [FAIL]" mptcp_lib_result_fail "New MPTCP socket cannot be blocked via sysctl" - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi =20 @@ -303,7 +303,7 @@ do_ping() =20 if [ $rc -ne 0 ] ; then echo "$listener_ns -> $connect_addr connectivity [FAIL]" 1>&2 - ret=3D1 + ret=3D${KSFT_FAIL} =20 return 1 fi @@ -823,7 +823,7 @@ log_if_error() echo "FAIL: ${msg}" 1>&2 =20 final_ret=3D${ret} - ret=3D0 + ret=3D${KSFT_PASS} =20 return ${final_ret} fi diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index fa7d07c51973..ba6d34bb2d0b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -25,7 +25,6 @@ err=3D"" capout=3D"" ns1=3D"" ns2=3D"" -ksft_skip=3D4 iptables=3D"iptables" ip6tables=3D"ip6tables" timeout_poll=3D30 @@ -398,15 +397,15 @@ setup_fail_rules() -p tcp \ -m length --length 150:9999 \ -m statistic --mode nth --packet 1 --every 99999 \ - -j MARK --set-mark 42 || return ${ksft_skip} + -j MARK --set-mark 42 || return ${KSFT_SKIP} =20 - tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${ksft_skip} + tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${KSFT_SKIP} tc -n $ns2 filter add dev ns2eth$i egress \ protocol ip prio 1000 \ handle 42 fw \ action pedit munge offset 148 u8 invert \ pipe csum tcp \ - index 100 || return ${ksft_skip} + index 100 || return ${KSFT_SKIP} } =20 reset_with_fail() @@ -420,7 +419,7 @@ reset_with_fail() local rc=3D0 setup_fail_rules "${@}" || rc=3D$? =20 - if [ ${rc} -eq ${ksft_skip} ]; then + if [ ${rc} -eq ${KSFT_SKIP} ]; then mark_as_skipped "unable to set the 'fail' rules" return 1 fi @@ -456,7 +455,7 @@ reset_with_tcp_filter() # $1: err msg fail_test() { - ret=3D1 + ret=3D${KSFT_FAIL} =20 print_fail "${@}" =20 @@ -3639,7 +3638,7 @@ usage() { if [ -n "${1}" ]; then echo "${1}" - ret=3D1 + ret=3D${KSFT_FAIL} fi =20 echo "mptcp_join usage:" diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index a2a5049f22bb..59ae6c649904 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -106,7 +106,7 @@ check_mark() for v in $values; do if [ $v -ne 0 ]; then echo "FAIL: got $tables $values in ns $ns , not 0 - not all expected pa= ckets marked" 1>&2 - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi done @@ -175,7 +175,7 @@ do_transfer() mptcp_lib_print_err "[FAIL]" mptcp_lib_result_fail "transfer ${ip}" =20 - ret=3D1 + ret=3D${KSFT_FAIL} return 1 fi mptcp_lib_print_ok "[ OK ]" diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 87ed60ed4112..82dbdec930e6 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -21,11 +21,11 @@ while getopts "$optstring" option;do case "$option" in "h") usage $0 - exit 0 + exit ${KSFT_PASS} ;; "?") usage $0 - exit 1 + exit ${KSFT_FAIL} ;; esac done diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index eb2eaa48035f..ff255e4a2ed3 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -262,7 +262,7 @@ while getopts "bcdh" option;do case "$option" in "h") usage $0 - exit 0 + exit ${KSFT_PASS} ;; "b") bail=3D1 @@ -275,7 +275,7 @@ while getopts "bcdh" option;do ;; "?") usage $0 - exit 1 + exit ${KSFT_FAIL} ;; esac done diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 6fe2a4e1704f..1124ebab3ace 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -79,7 +79,7 @@ test_skip() test_fail() { mptcp_lib_print_err "[FAIL]${1:+ ${*}}" - ret=3D1 + ret=3D${KSFT_FAIL} =20 if [ -n "${1}" ]; then _printf "\t%s\n" "${1}" @@ -204,7 +204,7 @@ make_connection() else test_fail "Expected tokens (c:${client_token} - s:${server_token}) and s= erver (c:${client_serverside} - s:${server_serverside})" mptcp_lib_result_print_all_tap - exit 1 + exit ${KSFT_FAIL} fi =20 if [ "$is_v6" =3D "v6" ] --=20 2.40.1