forked from rpms/libvirt
ac56d1c20b
- tests: Use DO_TEST_CAPS_*_ABI_UPDATE() for ppc64 (rhbz#2196178) - tests: Switch to firmware autoselection for hvf (rhbz#2196178) - tests: Use virt-4.0 machine type for aarch64 (rhbz#2196178) - tests: Consistently use /path/to/guest_VARS.fd (rhbz#2196178) - tests: Turn abi-update.xml into a symlink (rhbz#2196178) - tests: Rename firmware-auto-efi-nvram-path (rhbz#2196178) - qemu: Fix return value for qemuFirmwareFillDomainLegacy() (rhbz#2196178) - qemu: Fix lookup against stateless/combined pflash (rhbz#2196178) - tests: Add some more DO_TEST*ABI_UPDATE* macros (rhbz#2196178) - tests: Add more tests for firmware selection (rhbz#2196178) - tests: Update firmware descriptor files (rhbz#2196178) - tests: Drop tags from BIOS firmware descriptor (rhbz#2196178) - tests: Include microvm in firmwaretest (rhbz#2196178) - qemu: Don't overwrite NVRAM template for legacy firmware (rhbz#2196178) - qemu: Generate NVRAM path in more cases (rhbz#2196178) - qemu: Filter firmware based on loader.readonly (rhbz#2196178) - qemu: Match NVRAM template extension for new domains (rhbz#2196178) - conf: Don't default to raw format for loader/NVRAM (rhbz#2196178) - tests: Rename firmware-auto-efi-format-loader-qcow2-nvram-path (rhbz#2196178) - tests: Reintroduce firmware-auto-efi-format-mismatch (rhbz#2196178) - rpm: Reorder scriptlets (rhbz#2210058) - rpm: Reduce use of with_modular_daemons (rhbz#2210058) - rpm: Remove custom libvirtd restart logic (rhbz#2210058) - rpm: Introduce new macros for handling of systemd units (rhbz#2210058) - rpm: Switch to new macros for handling of systemd units (rhbz#2210058) - rpm: Delete unused macros (rhbz#2210058) Resolves: rhbz#2196178, rhbz#2210058
95 lines
3.6 KiB
Diff
95 lines
3.6 KiB
Diff
From b0d6ee0778c6c2f49c88de9025f6a398b2d07c0f Mon Sep 17 00:00:00 2001
|
|
Message-ID: <b0d6ee0778c6c2f49c88de9025f6a398b2d07c0f.1692951632.git.jdenemar@redhat.com>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Tue, 16 May 2023 16:50:37 +0200
|
|
Subject: [PATCH] tests: Add some more DO_TEST*ABI_UPDATE* macros
|
|
|
|
These are going to be useful later.
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit 87d91e9e242520048579009ce2ddf8b238ec2733)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2196178
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
---
|
|
tests/qemuxml2argvtest.c | 19 +++++++++++++++++++
|
|
tests/qemuxml2xmltest.c | 3 +++
|
|
2 files changed, 22 insertions(+)
|
|
|
|
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
index 84e0963ec8..a8711ff833 100644
|
|
--- a/tests/qemuxml2argvtest.c
|
|
+++ b/tests/qemuxml2argvtest.c
|
|
@@ -836,6 +836,9 @@ mymain(void)
|
|
# define DO_TEST_CAPS_LATEST(name) \
|
|
DO_TEST_CAPS_ARCH_LATEST(name, "x86_64")
|
|
|
|
+# define DO_TEST_CAPS_LATEST_ABI_UPDATE(name) \
|
|
+ DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, "x86_64")
|
|
+
|
|
# define DO_TEST_CAPS_VER(name, ver) \
|
|
DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
|
|
|
|
@@ -855,6 +858,11 @@ mymain(void)
|
|
DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
|
|
ARG_FLAGS, FLAG_EXPECT_FAILURE)
|
|
|
|
+# define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_FAILURE(name, arch) \
|
|
+ DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
|
|
+ ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, \
|
|
+ ARG_FLAGS, FLAG_EXPECT_FAILURE)
|
|
+
|
|
# define DO_TEST_CAPS_ARCH_VER_FAILURE(name, arch, ver) \
|
|
DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \
|
|
ARG_FLAGS, FLAG_EXPECT_FAILURE)
|
|
@@ -862,6 +870,9 @@ mymain(void)
|
|
# define DO_TEST_CAPS_LATEST_FAILURE(name) \
|
|
DO_TEST_CAPS_ARCH_LATEST_FAILURE(name, "x86_64")
|
|
|
|
+# define DO_TEST_CAPS_LATEST_ABI_UPDATE_FAILURE(name) \
|
|
+ DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_FAILURE(name, "x86_64")
|
|
+
|
|
# define DO_TEST_CAPS_VER_FAILURE(name, ver) \
|
|
DO_TEST_CAPS_ARCH_VER_FAILURE(name, "x86_64", ver)
|
|
|
|
@@ -869,6 +880,11 @@ mymain(void)
|
|
DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
|
|
ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
|
|
|
|
+# define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_PARSE_ERROR(name, arch) \
|
|
+ DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
|
|
+ ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, \
|
|
+ ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
|
|
+
|
|
# define DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, arch, ver) \
|
|
DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \
|
|
ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
|
|
@@ -876,6 +892,9 @@ mymain(void)
|
|
# define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \
|
|
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR(name, "x86_64")
|
|
|
|
+# define DO_TEST_CAPS_LATEST_ABI_UPDATE_PARSE_ERROR(name) \
|
|
+ DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_PARSE_ERROR(name, "x86_64")
|
|
+
|
|
# define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \
|
|
DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, "x86_64", ver)
|
|
|
|
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
index 6f7f6690bd..5356872ba8 100644
|
|
--- a/tests/qemuxml2xmltest.c
|
|
+++ b/tests/qemuxml2xmltest.c
|
|
@@ -184,6 +184,9 @@ mymain(void)
|
|
#define DO_TEST_CAPS_LATEST(name) \
|
|
DO_TEST_CAPS_ARCH_LATEST(name, "x86_64")
|
|
|
|
+#define DO_TEST_CAPS_LATEST_ABI_UPDATE(name) \
|
|
+ DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, "x86_64")
|
|
+
|
|
#define DO_TEST_CAPS_VER(name, ver) \
|
|
DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
|
|
|
|
--
|
|
2.42.0
|