[PATCH 0/3] tests: Improve ABI_UPDATE macros
Andrea Bolognani (3): tests: Drop ppc64-usb-controller-legacy tests: Use ABI_UPDATE macros more tests: Improve ABI_UPDATE macros ...fi-aarch64.aarch64-latest.abi-update.args} | 0 ...efi-aarch64.aarch64-latest.abi-update.xml} | 0 .../firmware-auto-efi-abi-update-aarch64.xml | 1 - .../firmware-auto-efi-abi-update.xml | 1 - ...-auto-efi-format-loader-raw-abi-update.xml | 1 - ...loader-raw.aarch64-latest.abi-update.args} | 0 ...-loader-raw.aarch64-latest.abi-update.xml} | 0 ...ware-auto-efi-loader-secure-abi-update.xml | 1 - ...ader-secure.x86_64-latest.abi-update.args} | 0 ...oader-secure.x86_64-latest.abi-update.xml} | 0 .../firmware-auto-efi-rw-abi-update.xml | 1 - ...-auto-efi-rw.x86_64-latest.abi-update.err} | 0 ...re-auto-efi.x86_64-latest.abi-update.args} | 0 ...are-auto-efi.x86_64-latest.abi-update.xml} | 0 ...efi-features.x86_64-latest.abi-update.err} | 0 ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 1 - ...nvdimm-ppc64.ppc64-latest.abi-update.args} | 0 ...-nvdimm-ppc64.ppc64-latest.abi-update.xml} | 0 ...memory-hotplug-ppc64-nonuma-abi-update.xml | 1 - ...ppc64-nonuma.ppc64-latest.abi-update.args} | 0 ...-ppc64-nonuma.ppc64-latest.abi-update.xml} | 0 ...64-usb-controller-legacy.ppc64-latest.args | 33 ------------- ...c64-usb-controller-legacy.ppc64-latest.xml | 38 --------------- .../ppc64-usb-controller-legacy.xml | 1 - .../ppc64-usb-controller-qemu-xhci.xml | 1 - ...b-controller.ppc64-latest.abi-update.args} | 0 ...sb-controller.ppc64-latest.abi-update.xml} | 0 tests/qemuxmlconftest.c | 48 ++++++++++--------- 28 files changed, 26 insertions(+), 102 deletions(-) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update-aarch64.aarch64-latest.args => firmware-auto-efi-aarch64.aarch64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml => firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args => firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml => firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update.x86_64-latest.args => firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update.x86_64-latest.xml => firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-rw-abi-update.x86_64-latest.err => firmware-auto-efi-rw.x86_64-latest.abi-update.err} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args => firmware-auto-efi.x86_64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml => firmware-auto-efi.x86_64-latest.abi-update.xml} (100%) rename tests/qemuxmlconfdata/{firmware-manual-efi-features.x86_64-latest.err => firmware-manual-efi-features.x86_64-latest.abi-update.err} (100%) delete mode 120000 tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml rename tests/qemuxmlconfdata/{memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args => memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml => memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml rename tests/qemuxmlconfdata/{memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args => memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml => memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml} (100%) delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml delete mode 120000 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml delete mode 120000 tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml rename tests/qemuxmlconfdata/{ppc64-usb-controller-qemu-xhci.ppc64-latest.args => ppc64-usb-controller.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{ppc64-usb-controller-qemu-xhci.ppc64-latest.xml => ppc64-usb-controller.ppc64-latest.abi-update.xml} (100%) -- 2.43.0
The input file is a symlink for the ppc64-usb-controller input file, so the output files are identical as well. It's just an unnecessary duplicate. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ...64-usb-controller-legacy.ppc64-latest.args | 33 ---------------- ...c64-usb-controller-legacy.ppc64-latest.xml | 38 ------------------- .../ppc64-usb-controller-legacy.xml | 1 - tests/qemuxmlconftest.c | 1 - 4 files changed, 73 deletions(-) delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml delete mode 120000 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args deleted file mode 100644 index 0b0b2a1986..0000000000 --- a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args +++ /dev/null @@ -1,33 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \ --accel tcg \ --cpu POWER9 \ --m size=262144k \ --object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":268435456}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml deleted file mode 100644 index c25b3918e9..0000000000 --- a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml +++ /dev/null @@ -1,38 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='ppc64' machine='pseries'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='forbid'>POWER9</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0' model='pci-ohci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </controller> - <controller type='pci' index='0' model='pci-root'> - <model name='spapr-pci-host-bridge'/> - <target index='0'/> - </controller> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </memballoon> - <panic model='pseries'/> - </devices> -</domain> diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml deleted file mode 120000 index a63a8064a4..0000000000 --- a/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml +++ /dev/null @@ -1 +0,0 @@ -ppc64-usb-controller.xml \ No newline at end of file diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index b6fb5e5052..be2386f730 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2544,7 +2544,6 @@ mymain(void) DO_TEST_CAPS_LATEST("input-linux"); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller-legacy", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-usb-controller-qemu-xhci", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpmproxy-double", "ppc64"); -- 2.43.0
In one case, the macro was open-coded. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/qemuxmlconftest.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index be2386f730..840c01b2d7 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1329,10 +1329,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-bios-not-stateless"); DO_TEST_CAPS_LATEST("firmware-manual-efi"); DO_TEST_CAPS_LATEST("firmware-manual-efi-features"); - DO_TEST_CAPS_ARCH_LATEST_FULL("firmware-manual-efi-features", "x86_64", - ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR, - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - ARG_END); + DO_TEST_CAPS_LATEST_ABI_UPDATE_PARSE_ERROR("firmware-manual-efi-features"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-legacy-paths"); DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-modern-paths"); -- 2.43.0
There are a number of cases in which we want to test both the normal behavior and the ABI_UPDATE behavior for the same input XML. The way this is currently implemented is ad-hoc, and involves symlinking the input XML as well as coming up with an alternative name for the ABI_UPDATE variant: in most cases the -abi-update suffix is added, but since this is not enforced there are a couple of cases where we do something else instead. To make things simpler and more consistent, implement the naming convention at the macro level. This way, we no longer need to create any symlinks for the input file, and the output files are automatically named correctly. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ...fi-aarch64.aarch64-latest.abi-update.args} | 0 ...efi-aarch64.aarch64-latest.abi-update.xml} | 0 .../firmware-auto-efi-abi-update-aarch64.xml | 1 - .../firmware-auto-efi-abi-update.xml | 1 - ...-auto-efi-format-loader-raw-abi-update.xml | 1 - ...loader-raw.aarch64-latest.abi-update.args} | 0 ...-loader-raw.aarch64-latest.abi-update.xml} | 0 ...ware-auto-efi-loader-secure-abi-update.xml | 1 - ...ader-secure.x86_64-latest.abi-update.args} | 0 ...oader-secure.x86_64-latest.abi-update.xml} | 0 .../firmware-auto-efi-rw-abi-update.xml | 1 - ...-auto-efi-rw.x86_64-latest.abi-update.err} | 0 ...re-auto-efi.x86_64-latest.abi-update.args} | 0 ...are-auto-efi.x86_64-latest.abi-update.xml} | 0 ...efi-features.x86_64-latest.abi-update.err} | 0 ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 1 - ...nvdimm-ppc64.ppc64-latest.abi-update.args} | 0 ...-nvdimm-ppc64.ppc64-latest.abi-update.xml} | 0 ...memory-hotplug-ppc64-nonuma-abi-update.xml | 1 - ...ppc64-nonuma.ppc64-latest.abi-update.args} | 0 ...-ppc64-nonuma.ppc64-latest.abi-update.xml} | 0 .../ppc64-usb-controller-qemu-xhci.xml | 1 - ...b-controller.ppc64-latest.abi-update.args} | 0 ...sb-controller.ppc64-latest.abi-update.xml} | 0 tests/qemuxmlconftest.c | 42 +++++++++++-------- 25 files changed, 25 insertions(+), 25 deletions(-) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update-aarch64.aarch64-latest.args => firmware-auto-efi-aarch64.aarch64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml => firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args => firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml => firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update.x86_64-latest.args => firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update.x86_64-latest.xml => firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-rw-abi-update.x86_64-latest.err => firmware-auto-efi-rw.x86_64-latest.abi-update.err} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args => firmware-auto-efi.x86_64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml => firmware-auto-efi.x86_64-latest.abi-update.xml} (100%) rename tests/qemuxmlconfdata/{firmware-manual-efi-features.x86_64-latest.err => firmware-manual-efi-features.x86_64-latest.abi-update.err} (100%) delete mode 120000 tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml rename tests/qemuxmlconfdata/{memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args => memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml => memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml rename tests/qemuxmlconfdata/{memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args => memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml => memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml rename tests/qemuxmlconfdata/{ppc64-usb-controller-qemu-xhci.ppc64-latest.args => ppc64-usb-controller.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{ppc64-usb-controller-qemu-xhci.ppc64-latest.xml => ppc64-usb-controller.ppc64-latest.abi-update.xml} (100%) diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml deleted file mode 120000 index 551082260a..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml +++ /dev/null @@ -1 +0,0 @@ -firmware-auto-efi-aarch64.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml deleted file mode 120000 index 348bfcc7f6..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml +++ /dev/null @@ -1 +0,0 @@ -firmware-auto-efi.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml deleted file mode 120000 index bdd4a9f7a0..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml +++ /dev/null @@ -1 +0,0 @@ -firmware-auto-efi-format-loader-raw.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml deleted file mode 120000 index a723eb2e08..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml +++ /dev/null @@ -1 +0,0 @@ -firmware-auto-efi-loader-secure.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml deleted file mode 120000 index 252c7f40a2..0000000000 --- a/tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml +++ /dev/null @@ -1 +0,0 @@ -firmware-auto-efi-rw.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.abi-update.err similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.abi-update.err diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml rename to tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.abi-update.err similarity index 100% rename from tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.abi-update.err diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml deleted file mode 120000 index c7d71906f6..0000000000 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml +++ /dev/null @@ -1 +0,0 @@ -memory-hotplug-nvdimm-ppc64.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml deleted file mode 120000 index 03410026cc..0000000000 --- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml +++ /dev/null @@ -1 +0,0 @@ -memory-hotplug-ppc64-nonuma.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml b/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml deleted file mode 120000 index a63a8064a4..0000000000 --- a/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml +++ /dev/null @@ -1 +0,0 @@ -ppc64-usb-controller.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.xml rename to tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 840c01b2d7..e693a3fc7c 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1129,9 +1129,11 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ARG_END) # define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, arch) \ - DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \ - ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, \ - ARG_END) + DO_TEST_FULL(name, "." arch "-latest.abi-update", \ + ARG_CAPS_ARCH, arch, \ + ARG_CAPS_VER, "latest", \ + ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, \ + ARG_END) # define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ARG_END) @@ -1165,9 +1167,12 @@ mymain(void) 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) + DO_TEST_FULL(name, "." arch "-latest.abi-update", \ + ARG_CAPS_ARCH, arch, \ + ARG_CAPS_VER, "latest", \ + ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, \ + ARG_FLAGS, FLAG_EXPECT_FAILURE, \ + ARG_END) # define DO_TEST_CAPS_ARCH_VER_FAILURE(name, arch, ver) \ DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \ @@ -1187,9 +1192,12 @@ mymain(void) 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) + DO_TEST_FULL(name, "." arch "-latest.abi-update", \ + ARG_CAPS_ARCH, arch, \ + ARG_CAPS_VER, "latest", \ + ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, \ + ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR, \ + ARG_END) # define DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, arch, ver) \ DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \ @@ -1370,12 +1378,12 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-not-stateless"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-nvram"); DO_TEST_CAPS_LATEST("firmware-auto-efi"); - DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi-abi-update"); + DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi"); DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless"); DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-rw"); - DO_TEST_CAPS_LATEST_ABI_UPDATE_PARSE_ERROR("firmware-auto-efi-rw-abi-update"); + DO_TEST_CAPS_LATEST_ABI_UPDATE_PARSE_ERROR("firmware-auto-efi-rw"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure"); - DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi-loader-secure-abi-update"); + DO_TEST_CAPS_LATEST_ABI_UPDATE("firmware-auto-efi-loader-secure"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-insecure"); DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-path"); DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-loader-path-nonstandard"); @@ -1386,7 +1394,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-enrolled-keys-no-secboot"); 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_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-aarch64", "aarch64"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-path"); DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram-template"); DO_TEST_CAPS_LATEST_FAILURE("firmware-auto-efi-nvram-template-nonstandard"); @@ -1400,7 +1408,7 @@ mymain(void) DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-qcow2-path"); 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_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-format-loader-raw", "aarch64"); DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-format-mismatch"); DO_TEST_CAPS_LATEST("clock-utc"); @@ -2491,7 +2499,7 @@ mymain(void) DO_TEST_CAPS_LATEST("memory-hotplug-dimm"); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma-abi-update", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma", "ppc64"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-access"); DO_TEST_CAPS_VER("memory-hotplug-nvdimm-label", "5.2.0"); @@ -2503,7 +2511,7 @@ mymain(void) DO_TEST_CAPS_VER("memory-hotplug-nvdimm-readonly", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-readonly"); DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-nvdimm-ppc64", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-nvdimm-ppc64-abi-update", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-nvdimm-ppc64", "ppc64"); DO_TEST_CAPS_VER("memory-hotplug-virtio-pmem", "5.2.0"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem"); @@ -2541,7 +2549,7 @@ mymain(void) DO_TEST_CAPS_LATEST("input-linux"); DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-usb-controller-qemu-xhci", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-usb-controller", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpmproxy-double", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpm-double", "ppc64"); -- 2.43.0
participants (2)
-
Andrea Bolognani -
Peter Krempa