From 27a69cc73c09971b038f7026ba46d6d26f98e7da Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 2 Mar 2023 16:53:47 +0100 Subject: [PATCH] qemuxml2argvtest: Convert 'sparc-minimal' case to DO_TEST_CAPS_ARCH_LATEST MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Convert the only outstanding test case for a 'sparc' machine to modern test infrastructure. 'sparc' machine type also needs to be added to the list of supported arches in testQemuGetLatestCaps. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- .../{sparc-minimal.args => sparc-minimal.sparc-latest.args} | 1 + tests/qemuxml2argvtest.c | 3 +-- tests/testutilsqemu.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename tests/qemuxml2argvdata/{sparc-minimal.args => sparc-minimal.sparc-latest.args} (95%) diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args similarity index 95% rename from tests/qemuxml2argvdata/sparc-minimal.args rename to tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args index 8afd60ee12..531016737e 100644 --- a/tests/qemuxml2argvdata/sparc-minimal.args +++ b/tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args @@ -32,4 +32,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-redhat62sparc/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device scsi-cd,bus=scsi.0,scsi-id=1,device_id=drive-scsi0-0-0-1,drive=libvirt-1-format,id=scsi0-0-0-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fc0f7830a9..c7569af872 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2737,8 +2737,7 @@ mymain(void) QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_NEC_USB_XHCI); - DO_TEST("sparc-minimal", - QEMU_CAPS_SCSI_NCR53C90); + DO_TEST_CAPS_ARCH_LATEST("sparc-minimal", "sparc"); DO_TEST_CAPS_LATEST_PARSE_ERROR("missing-machine"); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8738b69c84..89c257fe0e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -829,6 +829,7 @@ testQemuGetLatestCaps(void) "riscv64", "s390x", "x86_64", + "sparc", }; g_autoptr(GHashTable) capslatest = virHashNew(g_free); size_t i;