tests/functional/test_aarch64_virt_gpu: Skip if "dbus" display isn't available

Commit Message

Thomas Huth March 25, 2025, 6:16 a.m. UTC

From: Thomas Huth <[e-mail]>

This test currently fails if the "dbus" display has not been compiled
into the binary (which can happen when CFI has been enabled, for example).
Check for the error message to skip the test in that case.

While we're at it, also make sure that this test is covered in the
right section in the MAINTAINERS file.

Signed-off-by: Thomas Huth <[e-mail]>
---
 MAINTAINERS                               | 2 +-
 tests/functional/test_aarch64_virt_gpu.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Alex Bennée March 25, 2025, 10:18 a.m. UTC | #1

Thomas Huth <[e-mail]> writes:

> From: Thomas Huth <[e-mail]>
>
> This test currently fails if the "dbus" display has not been compiled
> into the binary (which can happen when CFI has been enabled, for example).
> Check for the error message to skip the test in that case.
>
> While we're at it, also make sure that this test is covered in the
> right section in the MAINTAINERS file.
>
> Signed-off-by: Thomas Huth <[e-mail]>

Reviewed-by: Alex Bennée <[e-mail]>

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 8f470a1c9b7..c1ccb0acd14 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1018,7 +1018,7 @@  S: Maintained
 F: hw/arm/virt*
 F: include/hw/arm/virt.h
 F: docs/system/arm/virt.rst
-F: tests/functional/test_aarch64_virt.py
+F: tests/functional/test_aarch64_virt*.py
 F: tests/functional/test_aarch64_tuxrun.py
 F: tests/functional/test_arm_tuxrun.py
 
diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py
index 314d994a7aa..38447278579 100755
--- a/tests/functional/test_aarch64_virt_gpu.py
+++ b/tests/functional/test_aarch64_virt_gpu.py
@@ -74,6 +74,8 @@  def _launch_virt_gpu(self, gpu_device):
                 self.skipTest("Can't access host DRM render node")
             elif "'type' does not accept value 'egl-headless'" in excp.output:
                 self.skipTest("egl-headless support is not available")
+            elif "'type' does not accept value 'dbus'" in excp.output:
+                self.skipTest("dbus display support is not available")
             else:
                 self.log.info("unhandled launch failure: %s", excp.output)
                 raise excp