qemuxml2argvtest: Fix serial-unix-missing-source case

Use x86_64 emulator and machine and remove the nocaps version of the
test.

Fixes: 80a37e96a95
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.err b/tests/qemuxml2argvdata/serial-unix-missing-source.err
deleted file mode 100644 (file)
index bfbefc8..0000000
--- a/tests/qemuxml2argvdata/serial-unix-missing-source.err
+++ /dev/null
@@ -1 +0,0 @@
-internal error: Missing source path attribute for char device

diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err b/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err
index 86be3aead446b34098f58d54b888819e5b9b88be..bfbefc8cce5ca37ebe42b42f390934bdcece53ac 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err
+++ b/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err
@@ -1 +1 @@
-unsupported configuration: Emulator '/usr/bin/qemu-system-aarch64' does not support arch 'aarch64'
+internal error: Missing source path attribute for char device

diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.xml b/tests/qemuxml2argvdata/serial-unix-missing-source.xml
index 1e1221f12dace9ad88aa6d8d49b3a3a7dd5efb93..462f2b429eb942605e17b4c102d138b6742a11dc 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-missing-source.xml
+++ b/tests/qemuxml2argvdata/serial-unix-missing-source.xml
@@ -4,10 +4,10 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <devices>
-    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <serial type='unix'>
       <target type='pci-serial'/>
     </serial>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3932a5d28cd93571418eca3231d42ba0ef6d8577..6f2ac9ee2a167f436d8199a5868ac7f40177c440 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1514,7 +1514,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase");
     DO_TEST_CAPS_LATEST("serial-file-chardev");
     DO_TEST_CAPS_LATEST("serial-unix-chardev");
-    DO_TEST_PARSE_ERROR_NOCAPS("serial-unix-missing-source");
     DO_TEST("serial-tcp-chardev",
             QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-udp-chardev",