On Fri, Mar 29, 2024 at 03:51:05PM +0100, Matthieu Baerts (NGI0) wrote:
> From: Geliang Tang <tanggeliang@xxxxxxxxxx>
>
> 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: df62f2ec3df6 ("selftests/mptcp: add diag interface tests")
> Cc: stable@xxxxxxxxxxxxxxx
> Fixes: 42fb6cddec3b ("selftests: mptcp: more stable diag tests")
> Signed-off-by: Geliang Tang <tanggeliang@xxxxxxxxxx>
> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> (cherry picked from commit 45bcc0346561daa3f59e19a753cc7f3e08e8dff1)
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
> ---
> Notes:
> - Conflicts in diag.sh because the commit ce9902573652 ("selftests:
> mptcp: diag: format subtests results in TAP") is not in v5.15 tree.
> These conflicts were in the context for an unrelated feature.
> - Compared to the conflicts seen with the same patch in the v6.1 tree,
> there was an extra one here in v5.15 because the commit f2ae0fa68e28
> ("selftests/mptcp: add diag listen tests") is no the in this tree: it
> moves the assignation of 'ret' in '__chk_nr()' under an extra check.
> The conflict was easy to fix, simply by changing the value of 'ret'
> from the previous location.
Both now queued up, thanks.
greg k-h
