Re: [kvm-unit-tests PATCH] s390x: Fix arch_cmd

[Alexandru Elisei <alexandru.elisei@arm.com>]

Hi Drew,

On Wed, Jul 09, 2025 at 10:59:39AM +0200, Andrew Jones wrote:
> As commit ("scripts: Add 'test_args' test definition parameter") states
> in its summary, it adds another parameter. Make sure we account for it
> in the s390x-specific arch_cmd as well.
> 
> Fixes: a7794f16c84a ("scripts: Add 'test_args' test definition parameter")
> Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
> ---
>  scripts/s390x/func.bash | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/scripts/s390x/func.bash b/scripts/s390x/func.bash
> index f04e8e2ac0a7..28c3a70c7da9 100644
> --- a/scripts/s390x/func.bash
> +++ b/scripts/s390x/func.bash
> @@ -11,15 +11,16 @@ function arch_cmd_s390x()
>  	local groups=$3
>  	local smp=$4
>  	local kernel=$5
> -	local opts=$6
> -	local arch=$7
> -	local machine=$8
> -	local check=$9
> -	local accel=${10}
> -	local timeout=${11}
> +	local test_args=$6
> +	local opts=$7
> +	local arch=$8
> +	local machine=$9
> +	local check=${10}
> +	local accel=${11}
> +	local timeout=${12}
>  
>  	# run the normal test case
> -	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
> +	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
>  
>  	# run PV test case
>  	if [ "$accel" = 'tcg' ] || grep -q "migration" <<< "$groups"; then
> @@ -35,5 +36,5 @@ function arch_cmd_s390x()
>  		print_result 'SKIP' $testname '' 'PVM image was not created'
>  		return 2
>  	fi
> -	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
> +	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
>  }

My bad, I vaguely remember having this change in an earlier version of kvmtool
support, but I must have dropped it at some point.

Looks correct to me, it matches the arguments from for_each_unittest():

Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>

Thanks,
Alex