[PATCH 04/19] qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest

Peter Krempa posted 19 patches 2 years, 1 month ago
[PATCH 04/19] qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest
Posted by Peter Krempa 2 years, 1 month ago
The qemu driver explicitly rejects such configuration, thus this is just
a generic XML2XML test case. Move it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 .../smbios-multiple-type2.xml                                   | 0
 tests/genericxml2xmltest.c                                      | 2 ++
 tests/qemuxml2xmltest.c                                         | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename tests/{qemuxml2argvdata => genericxml2xmlindata}/smbios-multiple-type2.xml (100%)

diff --git a/tests/qemuxml2argvdata/smbios-multiple-type2.xml b/tests/genericxml2xmlindata/smbios-multiple-type2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/smbios-multiple-type2.xml
rename to tests/genericxml2xmlindata/smbios-multiple-type2.xml
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index 3cf9bd8159..6025054876 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -216,6 +216,8 @@ mymain(void)
     DO_TEST_FAIL_INACTIVE("memorytune-colliding-allocs");
     DO_TEST_FAIL_INACTIVE("memorytune-colliding-cachetune");

+    DO_TEST("smbios-multiple-type2");
+
     DO_TEST("tseg");

     DO_TEST("launch-security-sev");
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 1010b68ebc..8cc0874f65 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -761,7 +761,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("tap-vhost-incorrect");
     DO_TEST_CAPS_LATEST("shmem-plain-doorbell");
     DO_TEST_CAPS_LATEST("smbios");
-    DO_TEST_CAPS_LATEST("smbios-multiple-type2");
     DO_TEST_CAPS_LATEST("smbios-type-fwcfg");

     DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64");
-- 
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
Re: [PATCH 04/19] qemuxml2argvdata: Move 'smbios-multiple-type2' case to genericxml2xmltest
Posted by Peter Krempa 2 years, 1 month ago
On Fri, Dec 15, 2023 at 13:33:14 +0100, Peter Krempa wrote:
> The qemu driver explicitly rejects such configuration, thus this is just
> a generic XML2XML test case. Move it.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>  .../smbios-multiple-type2.xml                                   | 0
>  tests/genericxml2xmltest.c                                      | 2 ++
>  tests/qemuxml2xmltest.c                                         | 1 -
>  3 files changed, 2 insertions(+), 1 deletion(-)
>  rename tests/{qemuxml2argvdata => genericxml2xmlindata}/smbios-multiple-type2.xml (100%)

Also tests/qemuxml2xmloutdata/smbios-multiple-type2.xml needs to be
removed. I've squashed that change in locally.
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org