External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2argvtest: Convert 'missing-machine' to DO_TEST_CAPS_LATEST

Browse Source 
Emulator binary change is needed to use the latest caps properly. The
comment is no longer needed, the expected error is recorded in the 'err'
file.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-01-05 22:46:50 +01:00
parent 41edcb57a8
commit 8dcbaa6ec8
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/qemuxml2argvdata/missing-machine.err
View File

@ -1 +0,0 @@
unsupported configuration: Emulator '/usr/bin/qemu-system-i386' does not support arch 'alpha'

1
tests/qemuxml2argvdata/missing-machine.x86_64-latest.err Normal file
View File

@ -0,0 +1 @@
unsupported configuration: Emulator '/usr/bin/qemu-system-x86_64' does not support arch 'alpha'

2
tests/qemuxml2argvdata/missing-machine.xml
View File

@ -14,7 +14,7 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-i386</emulator> <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/> <source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/> <target dev='hda' bus='ide'/>

11
tests/qemuxml2argvtest.c
View File

@ -3273,16 +3273,7 @@ mymain(void)
DO_TEST("sparc-minimal", DO_TEST("sparc-minimal",
QEMU_CAPS_SCSI_NCR53C90); QEMU_CAPS_SCSI_NCR53C90);
/* VM XML has invalid arch/ostype/virttype combo, but the SKIP flag DO_TEST_CAPS_LATEST_PARSE_ERROR("missing-machine");
* will avoid the error during parse. This will cause us to fill in
* the missing machine type using the i386 binary, despite it being
* the wrong binary for the arch. We expect to get a failure about
* bad arch later when creating the pretend command.
*/
DO_TEST_FULL("missing-machine", "",
ARG_FLAGS, FLAG_EXPECT_FAILURE,
ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE,
ARG_END);
DO_TEST_CAPS_VER("name-escape", "2.11.0"); DO_TEST_CAPS_VER("name-escape", "2.11.0");
DO_TEST_CAPS_LATEST("name-escape"); DO_TEST_CAPS_LATEST("name-escape");