Commit 45bcc034 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

selftests: mptcp: diag: return KSFT_FAIL not test_cnt 



The test counter 'test_cnt' should not be returned in diag.sh, e.g. what
if only the 4th test fail? Will do 'exit 4' which is 'exit ${KSFT_SKIP}',
the whole test will be marked as skipped instead of 'failed'!

So we should do ret=${KSFT_FAIL} instead.

Fixes: df62f2ec ("selftests/mptcp: add diag interface tests")
Cc: stable@vger.kernel.org
Fixes: 42fb6cdd ("selftests: mptcp: more stable diag tests")
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 429679dc

tools/testing/selftests/net/mptcp/diag.sh

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ __chk_nr() 
		else

			echo "[ fail ] expected $expected found $nr"

			mptcp_lib_result_fail "${msg}"

			ret=$test_cnt

			ret=${KSFT_FAIL}

		fi

	else

		echo "[  ok  ]"
@@ -124,11 +124,11 @@ wait_msk_nr() 
	if [ $i -ge $timeout ]; then

		echo "[ fail ] timeout while expecting $expected max $max last $nr"

		mptcp_lib_result_fail "${msg} # timeout"

		ret=$test_cnt

		ret=${KSFT_FAIL}

	elif [ $nr != $expected ]; then

		echo "[ fail ] expected $expected found $nr"

		mptcp_lib_result_fail "${msg} # unexpected result"

		ret=$test_cnt

		ret=${KSFT_FAIL}

	else

		echo "[  ok  ]"

		mptcp_lib_result_pass "${msg}"