[kvm-unit-tests PATCH] scripts/s390x: Fix the execution of the PV tests

[kvm-unit-tests PATCH] scripts/s390x: Fix the execution of the PV tests

[Thomas Huth]

Commit ccb37496 ("scripts: allow machine option to be specified in
unittests.cfg") added an additonal parameter (the "machine"), but
we forgot to add it to the spot that runs the PV test cases, so
those are currently broken without this fix.

Fixes: ccb37496 ("scripts: allow machine option to be specified in unittests.cfg")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 scripts/s390x/func.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/s390x/func.bash b/scripts/s390x/func.bash
index 6b817727..f04e8e2a 100644
--- a/scripts/s390x/func.bash
+++ b/scripts/s390x/func.bash
@@ -35,5 +35,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" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 }
-- 
2.45.1

Re: [kvm-unit-tests PATCH] scripts/s390x: Fix the execution of the PV tests

[Janosch Frank]

On 6/3/24 09:59, Thomas Huth wrote:
> Commit ccb37496 ("scripts: allow machine option to be specified in
> unittests.cfg") added an additonal parameter (the "machine"), but
> we forgot to add it to the spot that runs the PV test cases, so
> those are currently broken without this fix.
> 
> Fixes: ccb37496 ("scripts: allow machine option to be specified in unittests.cfg")
> Signed-off-by: Thomas Huth <thuth@redhat.com>

LGTM
Has this issue come up in the Gitlab CI or in your internal CI?

Re: [kvm-unit-tests PATCH] scripts/s390x: Fix the execution of the PV tests

[Thomas Huth]

On 03/06/2024 13.05, Janosch Frank wrote:
> On 6/3/24 09:59, Thomas Huth wrote:
>> Commit ccb37496 ("scripts: allow machine option to be specified in
>> unittests.cfg") added an additonal parameter (the "machine"), but
>> we forgot to add it to the spot that runs the PV test cases, so
>> those are currently broken without this fix.
>>
>> Fixes: ccb37496 ("scripts: allow machine option to be specified in 
>> unittests.cfg")
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> 
> LGTM
> Has this issue come up in the Gitlab CI or in your internal CI?

Gitlab CI does not run the PV tests yet - I just noticed it while running 
the tests on the s390x machine that I've got access to.

  Thomas

Re: [kvm-unit-tests PATCH] scripts/s390x: Fix the execution of the PV tests

[Nicholas Piggin]

On Mon Jun 3, 2024 at 5:59 PM AEST, Thomas Huth wrote:
> Commit ccb37496 ("scripts: allow machine option to be specified in
> unittests.cfg") added an additonal parameter (the "machine"), but
> we forgot to add it to the spot that runs the PV test cases, so
> those are currently broken without this fix.

Thanks, this is the one you already found? Looks good to me.

Thanks,
Nick

>
> Fixes: ccb37496 ("scripts: allow machine option to be specified in unittests.cfg")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  scripts/s390x/func.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/s390x/func.bash b/scripts/s390x/func.bash
> index 6b817727..f04e8e2a 100644
> --- a/scripts/s390x/func.bash
> +++ b/scripts/s390x/func.bash
> @@ -35,5 +35,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" "$check" "$accel" "$timeout"
> +	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
>  }