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
82 lines
4.5 KiB
Diff
82 lines
4.5 KiB
Diff
From f8725c0f60e94a393fc731f323bbdfdbaa35dd02 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <f8725c0f60e94a393fc731f323bbdfdbaa35dd02.1692951632.git.jdenemar@redhat.com>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Fri, 26 May 2023 18:16:24 +0200
|
|
Subject: [PATCH] tests: Rename firmware-auto-efi-nvram-path
|
|
|
|
The new name better describes the test scenario and will fit
|
|
better with the additional tests that we're about to introduce.
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit 4ba04107d9ebc0070f64a031673cef61a5947866)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2196178
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
---
|
|
...est.args => firmware-auto-efi-nvram-path.x86_64-latest.args} | 0
|
|
...ware-auto-efi-nvram.xml => firmware-auto-efi-nvram-path.xml} | 0
|
|
tests/qemuxml2argvtest.c | 2 +-
|
|
...atest.xml => firmware-auto-efi-nvram-path.x86_64-latest.xml} | 0
|
|
tests/qemuxml2xmltest.c | 2 +-
|
|
5 files changed, 2 insertions(+), 2 deletions(-)
|
|
rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.x86_64-latest.args => firmware-auto-efi-nvram-path.x86_64-latest.args} (100%)
|
|
rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-nvram-path.xml} (100%)
|
|
rename tests/qemuxml2xmloutdata/{firmware-auto-efi-nvram.x86_64-latest.xml => firmware-auto-efi-nvram-path.x86_64-latest.xml} (100%)
|
|
|
|
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest.args
|
|
similarity index 100%
|
|
rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
|
|
rename to tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest.args
|
|
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.xml
|
|
similarity index 100%
|
|
rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml
|
|
rename to tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.xml
|
|
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
index 549ecdf9ce..84e0963ec8 100644
|
|
--- a/tests/qemuxml2argvtest.c
|
|
+++ b/tests/qemuxml2argvtest.c
|
|
@@ -1059,7 +1059,6 @@ mymain(void)
|
|
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-nvram");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless");
|
|
- DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-insecure");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-path");
|
|
@@ -1072,6 +1071,7 @@ mymain(void)
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-smm-off");
|
|
DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64");
|
|
DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-abi-update-aarch64", "aarch64");
|
|
+ DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-path");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-file");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-nbd");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-iscsi");
|
|
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
|
|
similarity index 100%
|
|
rename from tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml
|
|
rename to tests/qemuxml2xmloutdata/firmware-auto-efi-nvram-path.x86_64-latest.xml
|
|
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
index 74e6a27b73..6f7f6690bd 100644
|
|
--- a/tests/qemuxml2xmltest.c
|
|
+++ b/tests/qemuxml2xmltest.c
|
|
@@ -886,7 +886,6 @@ mymain(void)
|
|
DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless");
|
|
- DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-insecure");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-path");
|
|
@@ -898,6 +897,7 @@ mymain(void)
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-smm-off");
|
|
DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64");
|
|
DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-abi-update-aarch64", "aarch64");
|
|
+ DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-path");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-file");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-nbd");
|
|
DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-network-iscsi");
|
|
--
|
|
2.42.0
|