aboutsummaryrefslogtreecommitdiff
path: root/tests/functional/qemu_test/cmd.py
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-08-30 15:38:29 +0200
committerThomas Huth <thuth@redhat.com>2024-09-04 12:28:00 +0200
commit1255f5e49654982ad5078ea4e8e78acf55c639ec (patch)
tree2561b217c9ebd8f6cac940899a01fff3f6aed3b6 /tests/functional/qemu_test/cmd.py
parent8f16cd80fcc2e3f502080ea72de55c9f9bc21f58 (diff)
downloadqemu-1255f5e49654982ad5078ea4e8e78acf55c639ec.zip
qemu-1255f5e49654982ad5078ea4e8e78acf55c639ec.tar.gz
qemu-1255f5e49654982ad5078ea4e8e78acf55c639ec.tar.bz2
tests/functional: Convert Aarch64 Virt machine avocado tests
Straight forward conversion. Update the SHA1 hash to SHA256 since SHA1 should not be used anymore nowadays. Provide get_qemu_img() helper in qemu_test. $ make check-functional-aarch64 V=1 ▶ 1/4 test_aarch64_virt.Aarch64VirtMachine.test_aarch64_virt_gicv2 OK ▶ 1/4 test_aarch64_virt.Aarch64VirtMachine.test_aarch64_virt_gicv3 OK ▶ 1/4 test_aarch64_virt.Aarch64VirtMachine.test_alpine_virt_tcg_gic_max OK 1/4 qemu:func-thorough+func-aarch64-thorough+thorough / func-aarch64-aarch64_virt OK 30.44s 3 subtests passed ... Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20240826103634.52384-1-philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-ID: <20240830133841.142644-36-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/functional/qemu_test/cmd.py')
-rw-r--r--tests/functional/qemu_test/cmd.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/functional/qemu_test/cmd.py b/tests/functional/qemu_test/cmd.py
index 8580ee8..3acd617 100644
--- a/tests/functional/qemu_test/cmd.py
+++ b/tests/functional/qemu_test/cmd.py
@@ -16,6 +16,8 @@ import os
import os.path
import subprocess
+from .config import BUILD_DIR
+
def has_cmd(name, args=None):
"""
@@ -176,3 +178,16 @@ def exec_command_and_wait_for_pattern(test, command,
:param failure_message: if this message appears, test fails
"""
_console_interaction(test, success_message, failure_message, command + '\r')
+
+def get_qemu_img(test):
+ test.log.debug('Looking for and selecting a qemu-img binary')
+
+ # If qemu-img has been built, use it, otherwise the system wide one
+ # will be used.
+ qemu_img = os.path.join(BUILD_DIR, 'qemu-img')
+ if os.path.exists(qemu_img):
+ return qemu_img
+ if has_cmd('qemu-img'):
+ return 'qemu-img'
+ test.skipTest('Could not find "qemu-img", which is required to '
+ 'create temporary images')