diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-03-27 09:06:37 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-03-27 09:06:37 -0400 |
| commit | 3a0ff62431d297eadc7213cc5b2abda9d1bfce7a (patch) | |
| tree | d2349cc705cd31ebf46f3ea0175d2bfdc1d8fe0c /tests/functional/test_aarch64_virt_gpu.py | |
| parent | b876e721f1c939f3e83ac85bd3c1c2821e12b3fa (diff) | |
| parent | 5a8d024f8d3f55846cb8385b025d795fee4afd35 (diff) | |
| download | focaccia-qemu-3a0ff62431d297eadc7213cc5b2abda9d1bfce7a.tar.gz focaccia-qemu-3a0ff62431d297eadc7213cc5b2abda9d1bfce7a.zip | |
Merge tag 'pull-request-2025-03-27' of https://gitlab.com/thuth/qemu into staging
* Make some functional tests more robust
* Fix a typo in the s390x code
# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmflBdQRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbVE8Q//RRi0ufAhOd9YfPYqteLvJDDl27rDMmsr
# Q0laGYe3ylyUQi9ALglUvfaKNRzJahURwNUqMTyGbTDh/JciQ2mgfYOu7+RsUrBp
# fw5HlGIYJt4p/m5MqiqqiJbQ1LMuEehs93WsywhXdrZ5dLrdeWytkddVd/wj9VG4
# EDYizESc1/8Gl6qOM5ZHa7nMs8KD9SnCrzhXFO2m6sPc9hsAJYfU0NJTPBQ/VDd7
# AyFq43fGNdmHbnERueSJa2CeVfIvoHwSMbVvTkBVdKm2N+09q8ZxqUcj7d5Ziz7f
# Dehn1DvbY3TTR7fR2PPx9EWdDkJ+s8LmJiO1/KsyQC502wCVgzucQxiuTBVs2wG3
# hnkTQ90DcuCAS7ci/1PisdvJSiEiwAV2YlkEWyTmrCCZzjafzARkc8g8QZhuYCSQ
# giz0yMpCla9zI9T/O5NMSsOWDBhy0iNeGwMH8+rDvFraX5a1w2tRTyCa00VWItxb
# rRGcEa8fizEB0eX4lpSjOgY9lkzXhUseS/sQoRlI+hNc0ZqSI6CjeiDemFIIEBTd
# OllPnvhRG7JMdqmDcQXys7uxc/1D9ZNM92P9BhR3VZswNW7O0hy/qfrgDxHkhPIN
# /CrqYgvmeqc1BIcPLIEQzd9nTgpOkggptR+WFGl4VQsDSPOtji9iBzOdsIhSVZlb
# eK0gOrb4Vks=
# =2v5a
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 27 Mar 2025 04:01:24 EDT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* tag 'pull-request-2025-03-27' of https://gitlab.com/thuth/qemu:
tests/functional/test_vnc: Skip test if VNC support is not available
tests/functional/test_aarch64_virt_gpu: Skip if "dbus" display isn't available
target/s390x: Fix a typo in s390_cpu_class_init()
tests/functional: Add missing require_netdev('user') statements
tests/functional/meson.build: Bump arm_aspeed_bletchley timeout
tests/functional/test_ppc64_replay: Mark the e500 test as flaky
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/functional/test_aarch64_virt_gpu.py')
| -rwxr-xr-x | tests/functional/test_aarch64_virt_gpu.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 314d994a7a..3844727857 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -74,6 +74,8 @@ class Aarch64VirtGPUMachine(LinuxKernelTest): 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 |