71 lines
2.9 KiB
Diff
71 lines
2.9 KiB
Diff
From 7673738e37d6cb0953b3d338fa8e05a09247a389 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <7673738e37d6cb0953b3d338fa8e05a09247a389.1692951632.git.jdenemar@redhat.com>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Thu, 3 Aug 2023 15:22:10 +0200
|
|
Subject: [PATCH] tests: Reintroduce firmware-auto-efi-format-mismatch
|
|
|
|
Since the previous version of this negative test now passes,
|
|
create a new version that still triggers the intended failure.
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit 7c328b6cf48b4b75c0964bc127aaafb640ea944c)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2196178
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
---
|
|
...auto-efi-format-mismatch.x86_64-latest.err | 1 +
|
|
.../firmware-auto-efi-format-mismatch.xml | 19 +++++++++++++++++++
|
|
tests/qemuxml2argvtest.c | 1 +
|
|
3 files changed, 21 insertions(+)
|
|
create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.x86_64-latest.err
|
|
create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.xml
|
|
|
|
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.x86_64-latest.err b/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.x86_64-latest.err
|
|
new file mode 100644
|
|
index 0000000000..abfdfc4357
|
|
--- /dev/null
|
|
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.x86_64-latest.err
|
|
@@ -0,0 +1 @@
|
|
+XML error: Format mismatch: loader.format='qcow2' nvram.format='raw'
|
|
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.xml b/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.xml
|
|
new file mode 100644
|
|
index 0000000000..4af77c3bee
|
|
--- /dev/null
|
|
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.xml
|
|
@@ -0,0 +1,19 @@
|
|
+<domain type='kvm'>
|
|
+ <name>guest</name>
|
|
+ <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
|
|
+ <memory unit='KiB'>1048576</memory>
|
|
+ <vcpu placement='static'>1</vcpu>
|
|
+ <os firmware='efi'>
|
|
+ <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
|
|
+ <loader format='qcow2'/>
|
|
+ <nvram format='raw'/>
|
|
+ </os>
|
|
+ <features>
|
|
+ <acpi/>
|
|
+ </features>
|
|
+ <devices>
|
|
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
|
|
+ <controller type='usb' model='none'/>
|
|
+ <memballoon model='none'/>
|
|
+ </devices>
|
|
+</domain>
|
|
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
index cc3345f5b1..37ae14d61b 100644
|
|
--- a/tests/qemuxml2argvtest.c
|
|
+++ b/tests/qemuxml2argvtest.c
|
|
@@ -1118,6 +1118,7 @@ mymain(void)
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-qcow2-network-nbd");
|
|
DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-format-loader-raw", "aarch64");
|
|
DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-format-loader-raw-abi-update", "aarch64");
|
|
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-format-mismatch");
|
|
|
|
DO_TEST_NOCAPS("clock-utc");
|
|
DO_TEST_NOCAPS("clock-localtime");
|
|
--
|
|
2.42.0
|