Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: mptcp: use KSFT_SKIP/KSFT_PASS/KSFT_FAIL

This patch uses the public var KSFT_SKIP in mptcp_lib.sh instead of
ksft_skip, and drop 'ksft_skip=4' in mptcp_join.sh.

Use KSFT_PASS and KSFT_FAIL macros instead of 0 and 1 after 'exit '
and 'ret=' in all scripts:

exit 0 -> exit ${KSFT_PASS}
exit 1 -> exit ${KSFT_FAIL}
ret=0 -> ret=${KSFT_PASS}
ret=1 -> ret=${KSFT_FAIL}

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-15-4f42c347b653@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Geliang Tang and committed by
Jakub Kicinski
8f7a69a8 23a0485d

+25 -26
+9 -9
tools/testing/selftests/net/mptcp/mptcp_connect.sh
··· 65 65 case "$option" in 66 66 "h") 67 67 usage $0 68 - exit 0 68 + exit ${KSFT_PASS} 69 69 ;; 70 70 "d") 71 71 if [ $OPTARG -ge 0 ];then 72 72 tc_delay="$OPTARG" 73 73 else 74 74 echo "-d requires numeric argument, got \"$OPTARG\"" 1>&2 75 - exit 1 75 + exit ${KSFT_FAIL} 76 76 fi 77 77 ;; 78 78 "e") ··· 96 96 sndbuf="$OPTARG" 97 97 else 98 98 echo "-S requires numeric argument, got \"$OPTARG\"" 1>&2 99 - exit 1 99 + exit ${KSFT_FAIL} 100 100 fi 101 101 ;; 102 102 "R") ··· 104 104 rcvbuf="$OPTARG" 105 105 else 106 106 echo "-R requires numeric argument, got \"$OPTARG\"" 1>&2 107 - exit 1 107 + exit ${KSFT_FAIL} 108 108 fi 109 109 ;; 110 110 "m") ··· 121 121 ;; 122 122 "?") 123 123 usage $0 124 - exit 1 124 + exit ${KSFT_FAIL} 125 125 ;; 126 126 esac 127 127 done ··· 263 263 if [ "$(ip netns exec ${disabled_ns} sysctl net.mptcp.enabled | awk '{ print $3 }')" -ne 1 ]; then 264 264 mptcp_lib_pr_fail "net.mptcp.enabled sysctl is not 1 by default" 265 265 mptcp_lib_result_fail "net.mptcp.enabled sysctl is not 1 by default" 266 - ret=1 266 + ret=${KSFT_FAIL} 267 267 return 1 268 268 fi 269 269 ip netns exec ${disabled_ns} sysctl -q net.mptcp.enabled=0 ··· 276 276 if [ ${err} -eq 0 ]; then 277 277 mptcp_lib_pr_fail "New MPTCP socket cannot be blocked via sysctl" 278 278 mptcp_lib_result_fail "New MPTCP socket cannot be blocked via sysctl" 279 - ret=1 279 + ret=${KSFT_FAIL} 280 280 return 1 281 281 fi 282 282 ··· 302 302 303 303 if [ $rc -ne 0 ] ; then 304 304 mptcp_lib_pr_fail "$listener_ns -> $connect_addr connectivity" 305 - ret=1 305 + ret=${KSFT_FAIL} 306 306 307 307 return 1 308 308 fi ··· 821 821 mptcp_lib_pr_fail "${msg}" 822 822 823 823 final_ret=${ret} 824 - ret=0 824 + ret=${KSFT_PASS} 825 825 826 826 return ${final_ret} 827 827 fi
+6 -7
tools/testing/selftests/net/mptcp/mptcp_join.sh
··· 25 25 capout="" 26 26 ns1="" 27 27 ns2="" 28 - ksft_skip=4 29 28 iptables="iptables" 30 29 ip6tables="ip6tables" 31 30 timeout_poll=30 ··· 391 392 -p tcp \ 392 393 -m length --length 150:9999 \ 393 394 -m statistic --mode nth --packet 1 --every 99999 \ 394 - -j MARK --set-mark 42 || return ${ksft_skip} 395 + -j MARK --set-mark 42 || return ${KSFT_SKIP} 395 396 396 - tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${ksft_skip} 397 + tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${KSFT_SKIP} 397 398 tc -n $ns2 filter add dev ns2eth$i egress \ 398 399 protocol ip prio 1000 \ 399 400 handle 42 fw \ 400 401 action pedit munge offset 148 u8 invert \ 401 402 pipe csum tcp \ 402 - index 100 || return ${ksft_skip} 403 + index 100 || return ${KSFT_SKIP} 403 404 } 404 405 405 406 reset_with_fail() ··· 413 414 local rc=0 414 415 setup_fail_rules "${@}" || rc=$? 415 416 416 - if [ ${rc} -eq ${ksft_skip} ]; then 417 + if [ ${rc} -eq ${KSFT_SKIP} ]; then 417 418 mark_as_skipped "unable to set the 'fail' rules" 418 419 return 1 419 420 fi ··· 449 450 # $1: err msg 450 451 fail_test() 451 452 { 452 - ret=1 453 + ret=${KSFT_FAIL} 453 454 454 455 if [ ${#} -gt 0 ]; then 455 456 print_fail "${@}" ··· 3631 3632 { 3632 3633 if [ -n "${1}" ]; then 3633 3634 echo "${1}" 3634 - ret=1 3635 + ret=${KSFT_FAIL} 3635 3636 fi 3636 3637 3637 3638 echo "mptcp_join usage:"
+2 -2
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
··· 105 105 if [ $v -ne 0 ]; then 106 106 mptcp_lib_pr_fail "got $tables $values in ns $ns," \ 107 107 "not 0 - not all expected packets marked" 108 - ret=1 108 + ret=${KSFT_FAIL} 109 109 return 1 110 110 fi 111 111 done ··· 178 178 179 179 mptcp_lib_result_fail "transfer ${ip}" 180 180 181 - ret=1 181 + ret=${KSFT_FAIL} 182 182 return 1 183 183 fi 184 184 if ! mptcp_lib_check_transfer $cin $sout "file received by server"; then
+4 -4
tools/testing/selftests/net/mptcp/pm_netlink.sh
··· 19 19 case "$option" in 20 20 "h") 21 21 usage $0 22 - exit 0 22 + exit ${KSFT_PASS} 23 23 ;; 24 24 "?") 25 25 usage $0 26 - exit 1 26 + exit ${KSFT_FAIL} 27 27 ;; 28 28 esac 29 29 done ··· 57 57 mptcp_lib_check_output "${err}" "${cmd}" "${expected}" || rc=${?} 58 58 if [ ${rc} -eq 2 ]; then 59 59 mptcp_lib_result_fail "${msg} # error ${rc}" 60 - ret=1 60 + ret=${KSFT_FAIL} 61 61 elif [ ${rc} -eq 0 ]; then 62 62 mptcp_lib_print_ok "[ OK ]" 63 63 mptcp_lib_result_pass "${msg}" 64 64 elif [ ${rc} -eq 1 ]; then 65 65 mptcp_lib_result_fail "${msg} # different output" 66 - ret=1 66 + ret=${KSFT_FAIL} 67 67 fi 68 68 } 69 69
+2 -2
tools/testing/selftests/net/mptcp/simult_flows.sh
··· 263 263 case "$option" in 264 264 "h") 265 265 usage $0 266 - exit 0 266 + exit ${KSFT_PASS} 267 267 ;; 268 268 "b") 269 269 bail=1 ··· 276 276 ;; 277 277 "?") 278 278 usage $0 279 - exit 1 279 + exit ${KSFT_FAIL} 280 280 ;; 281 281 esac 282 282 done
+2 -2
tools/testing/selftests/net/mptcp/userspace_pm.sh
··· 89 89 then 90 90 mptcp_lib_pr_fail "${@}" 91 91 fi 92 - ret=1 92 + ret=${KSFT_FAIL} 93 93 mptcp_lib_result_fail "${test_name}" 94 94 } 95 95 ··· 209 209 else 210 210 test_fail "Expected tokens (c:${client_token} - s:${server_token}) and server (c:${client_serverside} - s:${server_serverside})" 211 211 mptcp_lib_result_print_all_tap 212 - exit 1 212 + exit ${KSFT_FAIL} 213 213 fi 214 214 215 215 if [ "$is_v6" = "v6" ]