Re: [PATCH v1 5/6] tests/acceptance: tweak the tcg/kvm tests for virt

[Willian Rampazzo]

On Thu, May 27, 2021 at 1:11 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> Really it's only TCG that can select which GIC model you want, KVM
> guests should always be using the "host" version of the GIC for which
> QEMU already provides a handy shortcut. Make the KVM test use this and
> split the TCG test into it's two versions.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/acceptance/boot_linux.py | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py
> index 0d178038a0..7221452d4b 100644
> --- a/tests/acceptance/boot_linux.py
> +++ b/tests/acceptance/boot_linux.py
> @@ -75,10 +75,11 @@ def add_common_args(self):
>          self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
>          self.vm.add_args('-object', 
> 'rng-random,id=rng0,filename=/dev/urandom')
>
> -    def test_virt_tcg(self):
> +    def test_virt_tcg_gicv2(self):
>          """
>          :avocado: tags=accel:tcg
>          :avocado: tags=cpu:max
> +        :avocado: tags=device:gicv2
>          """
>          self.require_accelerator("tcg")
>          self.vm.add_args("-accel", "tcg")
> @@ -87,29 +88,28 @@ def test_virt_tcg(self):
>          self.add_common_args()
>          self.launch_and_wait()
>
> -    def test_virt_kvm_gicv2(self):
> +    def test_virt_tcg_gicv3(self):
>          """
> -        :avocado: tags=accel:kvm
> -        :avocado: tags=cpu:host
> -        :avocado: tags=device:gicv2
> +        :avocado: tags=accel:tcg
> +        :avocado: tags=cpu:max
> +        :avocado: tags=device:gicv3
>          """
> -        self.require_accelerator("kvm")
> -        self.vm.add_args("-accel", "kvm")
> -        self.vm.add_args("-cpu", "host")
> -        self.vm.add_args("-machine", "virt,gic-version=2")
> +        self.require_accelerator("tcg")
> +        self.vm.add_args("-accel", "tcg")
> +        self.vm.add_args("-cpu", "max")
> +        self.vm.add_args("-machine", "virt,gic-version=3")
>          self.add_common_args()
>          self.launch_and_wait()
>

This test is timing out for me. Maybe we should add a skip just like
on 
build/tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_quanta_gsj,
@skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might
timeout')?

> -    def test_virt_kvm_gicv3(self):
> +    def test_virt_kvm(self):
>          """
>          :avocado: tags=accel:kvm
>          :avocado: tags=cpu:host
> -        :avocado: tags=device:gicv3
>          """
>          self.require_accelerator("kvm")
>          self.vm.add_args("-accel", "kvm")
>          self.vm.add_args("-cpu", "host")
> -        self.vm.add_args("-machine", "virt,gic-version=3")
> +        self.vm.add_args("-machine", "virt,gic-version=host")
>          self.add_common_args()
>          self.launch_and_wait()
>
> --
> 2.20.1
>
>

Tested-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>