From: Alex Bennée <alex.bennee@linaro.org>
Date: Mon, 22 Feb 2021 10:14:52 +0000 (+0000)
Subject: tests/acceptance: allow a "graceful" failing for virtio-gpu test
X-Git-Tag: qemu-xen-4.16.0-rc4~318^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d98946450d82d2b46c3cc93e22cee2b189f019b0;p=qemu-xen.git

tests/acceptance: allow a "graceful" failing for virtio-gpu test

This is a band-aid with a TODO for cases when QEMU doesn't start due
to missing VirGL. Longer term we could do with some proper feature
probing.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210222101455.12640-4-alex.bennee@linaro.org>
---

diff --git a/tests/acceptance/virtio-gpu.py b/tests/acceptance/virtio-gpu.py
index ab1a4c1a71..ab18cddbb7 100644
--- a/tests/acceptance/virtio-gpu.py
+++ b/tests/acceptance/virtio-gpu.py
@@ -85,7 +85,12 @@ class VirtioGPUx86(Test):
             "-append",
             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", ""