Re: [PATCH mptcp-next v14 00/14] dump for userspace pm

[Geliang Tang <geliang@kernel.org>]

On Tue, Feb 20, 2024 at 12:50:49PM +0100, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 20/02/2024 10:58, Geliang Tang wrote:
> > From: Geliang Tang <tanggeliang@kylinos.cn>
> > 
> > v14:
> >  - address Matt's comments in v13.
> 
> Thank you for the new version!
> 
> I didn't look at it yet, but:
> 
> >  - I have to use these lines in patch #8:
> > 
> >       local cmd_ret=0
> >       local out=$(${cmd} 2>${err}) || cmd_ret=${?}
> > 
> >    The following expected code breaks pm_netlink.sh, I don't know why:
> > 
> >       local out cmd_ret=0
> >       out=$(${cmd} 2>${err}) || cmd_ret=${?}
> > 
> >    If this is still a problem, I'll send a squash-to patch to fix it.
> 
> Yes, we should either fix warnings or explicitly mark the false positive
> ones as ignored.
> 
> Can you try with the attached patch please? It is not clear to me why
> the second block doesn't do the same as the first one.

Thanks Matt, the attached patch works well. It fixes the issue I
mentioned perfectly.

> 
> I can squash it when applying the series if there are no other comments.

Great, thanks.

-Geliang

> 
> Cheers,
> Matt
> -- 
> Sponsored by the NGI0 Core fund.

> diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> index aca35376006b..556a7d9784d7 100644
> --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
> @@ -352,20 +352,24 @@ mptcp_lib_check_tools() {
>  }
>  
>  mptcp_lib_check_output() {
> -	local err="$1"
> -	local cmd="$2"
> -	local expected="$3"
> +	local err="${1}"
> +	local cmd="${2}"
> +	local expected="${3}"
>  	local cmd_ret=0
> -	local out=$(${cmd} 2>${err}) || cmd_ret=${?}
> +	local out
>  
> -	if [ $cmd_ret -ne 0 ]; then
> -		mptcp_lib_print_err "[FAIL] command execution '$cmd' stderr"
> +	if ! out=$(${cmd} 2>"${err}"); then
> +		cmd_ret=${?}
> +	fi
> +
> +	if [ ${cmd_ret} -ne 0 ]; then
> +		mptcp_lib_print_err "[FAIL] command execution '${cmd}' stderr"
>  		cat "${err}"
>  		return 2
> -	elif [ "$out" = "$expected" ]; then
> +	elif [ "${out}" = "${expected}" ]; then
>  		return 0
>  	else
> -		mptcp_lib_print_err "[FAIL] expected '$expected' got '$out'"
> +		mptcp_lib_print_err "[FAIL] expected '${expected}' got '${out}'"
>  		return 1
>  	fi
>  }