From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Auger Eric" <eric.auger@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Willian Rampazzo" <wrampazz@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [PATCH 1/6] tests/acceptance/virtio-gpu.py: use require_accelerator()
Date: Wed, 14 Jul 2021 13:40:46 -0400 [thread overview]
Message-ID: <20210714174051.28164-2-crosa@redhat.com> (raw)
In-Reply-To: <20210714174051.28164-1-crosa@redhat.com>
Since efe30d501 there's a shorthand for requiring specific
accelerators, and canceling the test if it's not available.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
tests/acceptance/virtio-gpu.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/tests/acceptance/virtio-gpu.py b/tests/acceptance/virtio-gpu.py
index 589332c1b7..42602a240a 100644
--- a/tests/acceptance/virtio-gpu.py
+++ b/tests/acceptance/virtio-gpu.py
@@ -17,10 +17,6 @@
import subprocess
-ACCEL_NOT_AVAILABLE_FMT = "%s accelerator does not seem to be available"
-KVM_NOT_AVAILABLE = ACCEL_NOT_AVAILABLE_FMT % "KVM"
-
-
def pick_default_vug_bin():
relative_path = "./contrib/vhost-user-gpu/vhost-user-gpu"
if is_readable_executable_file(relative_path):
@@ -66,8 +62,7 @@ def test_virtio_vga_virgl(self):
self.KERNEL_COMMON_COMMAND_LINE + "console=ttyS0 rdinit=/bin/bash"
)
# FIXME: should check presence of virtio, virgl etc
- if not kvm_available(self.arch, self.qemu_bin):
- self.cancel(KVM_NOT_AVAILABLE)
+ self.require_accelerator('kvm')
kernel_path = self.fetch_asset(self.KERNEL_URL)
initrd_path = self.fetch_asset(self.INITRD_URL)
@@ -107,8 +102,7 @@ def test_vhost_user_vga_virgl(self):
self.KERNEL_COMMON_COMMAND_LINE + "console=ttyS0 rdinit=/bin/bash"
)
# FIXME: should check presence of vhost-user-gpu, virgl, memfd etc
- if not kvm_available(self.arch, self.qemu_bin):
- self.cancel(KVM_NOT_AVAILABLE)
+ self.require_accelerator('kvm')
vug = pick_default_vug_bin()
if not vug:
--
2.31.1
next prev parent reply other threads:[~2021-07-14 17:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 17:40 [PATCH for 6.1 0/6] virtio-gpu acceptance test: use current device name Cleber Rosa
2021-07-14 17:40 ` Cleber Rosa [this message]
2021-07-14 21:51 ` [PATCH 1/6] tests/acceptance/virtio-gpu.py: use require_accelerator() Willian Rampazzo
2021-07-14 17:40 ` [PATCH 2/6] tests/acceptance/virtio-gpu.py: combine x86_64 arch tags Cleber Rosa
2021-07-14 21:52 ` Willian Rampazzo
2021-07-14 17:40 ` [PATCH 3/6] tests/acceptance/virtio-gpu.py: combine CPU tags Cleber Rosa
2021-07-14 21:53 ` Willian Rampazzo
2021-07-14 17:40 ` [PATCH 4/6] tests/acceptance/virtio-gpu.py: combine kernel command line Cleber Rosa
2021-07-14 21:54 ` Willian Rampazzo
2021-07-14 17:40 ` [PATCH 5/6] tests/acceptance/virtio-gpu.py: use virtio-vga-gl Cleber Rosa
2021-07-14 21:55 ` Willian Rampazzo
2021-07-20 9:36 ` Marc-André Lureau
2021-07-21 12:14 ` Gerd Hoffmann
2021-07-14 17:40 ` [PATCH 6/6] tests/acceptance/virtio-gpu.py: provide kernel and initrd hashes Cleber Rosa
2021-07-14 21:56 ` Willian Rampazzo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714174051.28164-2-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=ehabkost@redhat.com \
--cc=eric.auger@redhat.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=wrampazz@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).