[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/9] tests/avocado: Make pick_default_qemu_bin() more generic
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 4/9] tests/avocado: Make pick_default_qemu_bin() more generic |
Date: |
Mon, 8 Nov 2021 17:17:34 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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>
Message-Id: <20211105143416.148332-3-f4bug@amsat.org>
---
tests/avocado/avocado_qemu/__init__.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/avocado/avocado_qemu/__init__.py
b/tests/avocado/avocado_qemu/__init__.py
index a495e106d03..984c554e7d6 100644
--- a/tests/avocado/avocado_qemu/__init__.py
+++ b/tests/avocado/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
- [PULL 0/9] Integration testing patches for 2021-11-08, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 1/9] tests/acceptance: introduce new check-avocado target, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 3/9] tests/avocado: Extract QemuBaseTest from Test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 2/9] tests/acceptance: rename tests acceptance to tests avocado, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 4/9] tests/avocado: Make pick_default_qemu_bin() more generic,
Philippe Mathieu-Daudé <=
- [PULL 6/9] tests/avocado: Share useful helpers from virtiofs_submounts test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 5/9] tests/avocado: Introduce QemuUserTest base class, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 7/9] tests/avocado: Add bFLT loader linux-user test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 8/9] tests/avocado: Rename avocado_qemu.Test -> QemuSystemTest, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 9/9] tests/avocado: Remove p7zip binary availability check, Philippe Mathieu-Daudé, 2021/11/08
- Re: [PULL 0/9] Integration testing patches for 2021-11-08, Richard Henderson, 2021/11/08