Skip to content

Commit c3612d0

Browse files
committed
tests/functional/test_aarch64_virt_gpu: Skip if "dbus" display isn't available
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. Message-ID: <[email protected]> Reviewed-by: Alex Bennée <[email protected]> Signed-off-by: Thomas Huth <[email protected]>
1 parent 6a93b1c commit c3612d0

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ S: Maintained
10181018
F: hw/arm/virt*
10191019
F: include/hw/arm/virt.h
10201020
F: docs/system/arm/virt.rst
1021-
F: tests/functional/test_aarch64_virt.py
1021+
F: tests/functional/test_aarch64_virt*.py
10221022
F: tests/functional/test_aarch64_tuxrun.py
10231023
F: tests/functional/test_arm_tuxrun.py
10241024

tests/functional/test_aarch64_virt_gpu.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ def _launch_virt_gpu(self, gpu_device):
7474
self.skipTest("Can't access host DRM render node")
7575
elif "'type' does not accept value 'egl-headless'" in excp.output:
7676
self.skipTest("egl-headless support is not available")
77+
elif "'type' does not accept value 'dbus'" in excp.output:
78+
self.skipTest("dbus display support is not available")
7779
else:
7880
self.log.info("unhandled launch failure: %s", excp.output)
7981
raise excp

0 commit comments

Comments
 (0)