tests: qemuxml2xml: Convert genid* to TEST_CAPS

Convert these test cases to use DO_TEST_CAPS_LATEST

* genid
* genid-auto

This ensures the test infrastructure is working as expected for
a test case with explicit -active and -inactive XML test data

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/tests/qemuxml2xmloutdata/genid-active.xml b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-active.xml
rename to tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
index fc41f2dd2818aa0bad5c5861c5ae29d21a68e471..28390e51a6b72e29072cf49421788a3e21b6b1dd 100644 (file)
--- a/tests/qemuxml2xmloutdata/genid-active.xml
+++ b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
@@ -18,7 +18,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/genid-auto-active.xml b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-auto-active.xml
rename to tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
index aeca0d7fc083f10d9216ceb0e2c8361b442d06ab..e94846f453e2920544d5005f497dd2e816c55903 100644 (file)
--- a/tests/qemuxml2xmloutdata/genid-auto-active.xml
+++ b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
@@ -18,7 +18,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/genid-auto-inactive.xml b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-auto-inactive.xml
rename to tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
index a7b711d469baf9f1918c0e6b5d7eec938c55896d..f8ab86afa04a99e8c6721fddaaef829b2bed4172 100644 (file)
--- a/tests/qemuxml2xmloutdata/genid-auto-inactive.xml
+++ b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
@@ -18,7 +18,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/genid-inactive.xml b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/genid-inactive.xml
rename to tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
index 8bd526a7a9d206a66c34ffad652e21fa9f5bbd0a..c0813aa1dc0182d81e21f1e10b4b2537c1187993 100644 (file)
--- a/tests/qemuxml2xmloutdata/genid-inactive.xml
+++ b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
@@ -18,7 +18,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 1d232185ec9d5717cf20608e900a2728cb9fce95..812f5c7ea0b46d00b486a5f4812fbd3a3133fb06 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -244,8 +244,8 @@ mymain(void)
     setenv("PATH", "/bin", 1);
 
     DO_TEST("minimal", NONE);
-    DO_TEST("genid", NONE);
-    DO_TEST("genid-auto", NONE);
+    DO_TEST_CAPS_LATEST("genid");
+    DO_TEST_CAPS_LATEST("genid-auto");
     DO_TEST("machine-core-on", NONE);
     DO_TEST("machine-core-off", NONE);
     DO_TEST("machine-loadparm-multiple-disks-nets-s390", NONE);