[PATCH] tests/avocado/virtio-gpu: Cancel test if drm rendering is not available

Thomas Huth posted 1 patch 11 months, 1 week ago
Failed in applying to current master (apply log)
Maintainers: Cleber Rosa <crosa@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
tests/avocado/virtio-gpu.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
[PATCH] tests/avocado/virtio-gpu: Cancel test if drm rendering is not available
Posted by Thomas Huth 11 months, 1 week ago
The test_vhost_user_vga_virgl test currently fails on some CI
machines with:

 qemu-system-x86_64: egl: no drm render node available
 qemu-system-x86_64: egl: render node init failed

The other test in this file already checks whether there is
an error while starting QEMU - we should do the same for the
test_vhost_user_vga_virgl test, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/avocado/virtio-gpu.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/avocado/virtio-gpu.py b/tests/avocado/virtio-gpu.py
index e3b58fe799..89bfecc715 100644
--- a/tests/avocado/virtio-gpu.py
+++ b/tests/avocado/virtio-gpu.py
@@ -143,7 +143,11 @@ def test_vhost_user_vga_virgl(self):
             "-append",
             self.KERNEL_COMMAND_LINE,
         )
-        self.vm.launch()
+        try:
+            self.vm.launch()
+        except:
+            # TODO: probably fails because we are missing the VirGL features
+            self.cancel("VirGL not enabled?")
         self.wait_for_console_pattern("as init process")
         exec_command_and_wait_for_pattern(
             self, "/usr/sbin/modprobe virtio_gpu", ""
-- 
2.31.1
Re: [PATCH] tests/avocado/virtio-gpu: Cancel test if drm rendering is not available
Posted by Richard Henderson 11 months, 1 week ago
On 5/30/23 11:03, Thomas Huth wrote:
> The test_vhost_user_vga_virgl test currently fails on some CI
> machines with:
> 
>   qemu-system-x86_64: egl: no drm render node available
>   qemu-system-x86_64: egl: render node init failed
> 
> The other test in this file already checks whether there is
> an error while starting QEMU - we should do the same for the
> test_vhost_user_vga_virgl test, too.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/avocado/virtio-gpu.py | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)

Thanks.  I have applied this to master directly, trying to green the board.


r~

> 
> diff --git a/tests/avocado/virtio-gpu.py b/tests/avocado/virtio-gpu.py
> index e3b58fe799..89bfecc715 100644
> --- a/tests/avocado/virtio-gpu.py
> +++ b/tests/avocado/virtio-gpu.py
> @@ -143,7 +143,11 @@ def test_vhost_user_vga_virgl(self):
>               "-append",
>               self.KERNEL_COMMAND_LINE,
>           )
> -        self.vm.launch()
> +        try:
> +            self.vm.launch()
> +        except:
> +            # TODO: probably fails because we are missing the VirGL features
> +            self.cancel("VirGL not enabled?")
>           self.wait_for_console_pattern("as init process")
>           exec_command_and_wait_for_pattern(
>               self, "/usr/sbin/modprobe virtio_gpu", ""
Re: [PATCH] tests/avocado/virtio-gpu: Cancel test if drm rendering is not available
Posted by Philippe Mathieu-Daudé 11 months, 1 week ago
On 30/5/23 20:03, Thomas Huth wrote:
> The test_vhost_user_vga_virgl test currently fails on some CI
> machines with:
> 
>   qemu-system-x86_64: egl: no drm render node available
>   qemu-system-x86_64: egl: render node init failed
> 
> The other test in this file already checks whether there is
> an error while starting QEMU - we should do the same for the
> test_vhost_user_vga_virgl test, too.

Reported-by: Richard Henderson <richard.henderson@linaro.org>

> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/avocado/virtio-gpu.py | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/avocado/virtio-gpu.py b/tests/avocado/virtio-gpu.py
> index e3b58fe799..89bfecc715 100644
> --- a/tests/avocado/virtio-gpu.py
> +++ b/tests/avocado/virtio-gpu.py
> @@ -143,7 +143,11 @@ def test_vhost_user_vga_virgl(self):
>               "-append",
>               self.KERNEL_COMMAND_LINE,
>           )
> -        self.vm.launch()
> +        try:
> +            self.vm.launch()
> +        except:
> +            # TODO: probably fails because we are missing the VirGL features
> +            self.cancel("VirGL not enabled?")
>           self.wait_for_console_pattern("as init process")

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>