mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
selftests: mptcp: diag: return KSFT_FAIL not test_cnt
commit 45bcc0346561daa3f59e19a753cc7f3e08e8dff1 upstream.
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: df62f2ec3d ("selftests/mptcp: add diag interface tests")
Cc: stable@vger.kernel.org
Fixes: 42fb6cddec ("selftests: mptcp: more stable diag tests")
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
052e4c8987
commit
6d87a9be22
@@ -56,7 +56,7 @@ __chk_nr()
|
|||||||
echo "[ skip ] Feature probably not supported"
|
echo "[ skip ] Feature probably not supported"
|
||||||
else
|
else
|
||||||
echo "[ fail ] expected $expected found $nr"
|
echo "[ fail ] expected $expected found $nr"
|
||||||
ret=$test_cnt
|
ret=${KSFT_FAIL}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "[ ok ]"
|
echo "[ ok ]"
|
||||||
@@ -100,10 +100,10 @@ wait_msk_nr()
|
|||||||
printf "%-50s" "$msg"
|
printf "%-50s" "$msg"
|
||||||
if [ $i -ge $timeout ]; then
|
if [ $i -ge $timeout ]; then
|
||||||
echo "[ fail ] timeout while expecting $expected max $max last $nr"
|
echo "[ fail ] timeout while expecting $expected max $max last $nr"
|
||||||
ret=$test_cnt
|
ret=${KSFT_FAIL}
|
||||||
elif [ $nr != $expected ]; then
|
elif [ $nr != $expected ]; then
|
||||||
echo "[ fail ] expected $expected found $nr"
|
echo "[ fail ] expected $expected found $nr"
|
||||||
ret=$test_cnt
|
ret=${KSFT_FAIL}
|
||||||
else
|
else
|
||||||
echo "[ ok ]"
|
echo "[ ok ]"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user