[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 2/6] tests/acceptance: Make pick_default_qemu_bin() more gener
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 2/6] tests/acceptance: Make pick_default_qemu_bin() more generic |
Date: |
Tue, 2 Nov 2021 09:42:28 +0100 |
Make pick_default_qemu_bin() generic to find qemu-system or
qemu-user binaries.
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v5: Use PEP3135
---
tests/acceptance/avocado_qemu/__init__.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py
b/tests/acceptance/avocado_qemu/__init__.py
index 1ed381f5037..9b2ea3b248a 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -45,7 +45,7 @@ def is_readable_executable_file(path):
return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK)
-def pick_default_qemu_bin(arch=None):
+def pick_default_qemu_bin(bin_prefix='qemu-system-', arch=None):
"""
Picks the path of a QEMU binary, starting either in the current working
directory or in the source tree root directory.
@@ -64,7 +64,7 @@ def pick_default_qemu_bin(arch=None):
# qemu binary path does not match arch for powerpc, handle it
if 'ppc64le' in arch:
arch = 'ppc64'
- qemu_bin_relative_path = "./qemu-system-%s" % arch
+ qemu_bin_relative_path = os.path.join(".", bin_prefix + arch)
if is_readable_executable_file(qemu_bin_relative_path):
return qemu_bin_relative_path
@@ -179,14 +179,14 @@ def _get_unique_tag_val(self, tag_name):
return vals.pop()
return None
- def setUp(self):
+ def setUp(self, bin_prefix):
self.arch = self.params.get('arch',
default=self._get_unique_tag_val('arch'))
self.cpu = self.params.get('cpu',
default=self._get_unique_tag_val('cpu'))
- default_qemu_bin = pick_default_qemu_bin(arch=self.arch)
+ default_qemu_bin = pick_default_qemu_bin(bin_prefix, arch=self.arch)
self.qemu_bin = self.params.get('qemu_bin',
default=default_qemu_bin)
if self.qemu_bin is None:
@@ -214,7 +214,7 @@ class Test(QemuBaseTest):
def setUp(self):
self._vms = {}
- super().setUp()
+ super().setUp('qemu-system-')
self.machine = self.params.get('machine',
default=self._get_unique_tag_val('machine'))
--
2.31.1
- [PATCH v5 0/6] tests/acceptance: Add bFLT loader linux-user test, Philippe Mathieu-Daudé, 2021/11/02
- [PATCH v5 1/6] tests/acceptance: Extract QemuBaseTest from Test, Philippe Mathieu-Daudé, 2021/11/02
- [PATCH v5 2/6] tests/acceptance: Make pick_default_qemu_bin() more generic,
Philippe Mathieu-Daudé <=
- [PATCH v5 3/6] tests/acceptance: Introduce QemuUserTest base class, Philippe Mathieu-Daudé, 2021/11/02
- [PATCH v5 4/6] tests/acceptance: Share useful helpers from virtiofs_submounts test, Philippe Mathieu-Daudé, 2021/11/02
- [PATCH v5 5/6] tests/acceptance: Add bFLT loader linux-user test, Philippe Mathieu-Daudé, 2021/11/02
- [PATCH v5 6/6] tests/acceptance: Rename avocado_qemu.Test -> QemuSystemTest, Philippe Mathieu-Daudé, 2021/11/02