Tue Aug 21 10:36:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

	* tests/xencapsdata/*.xml: Fixed tests to include new
	  <migration_features> element in capabilities XML.

diff --git a/ChangeLog b/ChangeLog
index 2ec5e6d72d1997a0e5076b794a7ad605d10846da..415c9601ef188133aa2aeb79ac1c996219a75534 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 21 10:36:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * tests/xencapsdata/*.xml: Fixed tests to include new
+         <migration_features> element in capabilities XML.
+
 Tue Aug 21 10:21:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/libvirt.c (virDomainMigrate): Added virDomainMigrate

diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 93d1cd27253fdb85477a42ffe5e3f9881cba7a0c..eda1397dbe43795cf6cf3f1b61a5f209776f043b 100644 (file)
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -30,7 +30,7 @@ static int testCompareFiles(const char *xml, const char *sexpr, int xendConfigVe
 
   if (strcmp(xmlData, gotxml)) {
     if (getenv("DEBUG_TESTS")) {
-       printf("In test file %s -> %s:\n", sexpr, xml);
+        printf("In test file %s -> %s:\n", sexpr, xml);
         printf("Expect %d '%s'\n", (int)strlen(xmlData), xmlData);
         printf("Actual %d '%s'\n", (int)strlen(gotxml), gotxml);
     }

diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
index 1c86076e5db4cb82b999b2a8dbf99b9c5501cadb..8bff3bd56f08badcee6f48273204fd2335abf7ae 100644 (file)
--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
+++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
@@ -6,6 +6,12 @@
         <vmx/>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml
index d54b1cbe3998dc44cb4d9736e482a901e95cbdc9..03deb989a4f461f7140283e47775ab1cb7ee8bdf 100644 (file)
--- a/tests/xencapsdata/xen-i686-pae.xml
+++ b/tests/xencapsdata/xen-i686-pae.xml
@@ -6,6 +6,12 @@
         <vmx/>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml
index fa932a451f37fe9467982ba9dd503cf4898fa6c2..6f25a1d35c7fbecf63128b8659387d1d6817d259 100644 (file)
--- a/tests/xencapsdata/xen-i686.xml
+++ b/tests/xencapsdata/xen-i686.xml
@@ -5,6 +5,12 @@
       <features>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
index 598e646d8216d492462f6a64d37af88f1c6c0cbb..426ccfac566d560617b5c7748ffac1fa11db5e1d 100644 (file)
--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
@@ -5,6 +5,12 @@
       <features>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml
index 507ef762f30e379c8e7c30e505fccaeb3b59c2b2..125448a0cbdf3b4a3312b51d2b2e9fcd07652a1e 100644 (file)
--- a/tests/xencapsdata/xen-ia64-be.xml
+++ b/tests/xencapsdata/xen-ia64-be.xml
@@ -5,6 +5,12 @@
       <features>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
index 84a06634a1b36df380ee9835b4bc625fc00c2a94..730db4b0c0ac448c8c5cdbd29ba4761bc55e0a46 100644 (file)
--- a/tests/xencapsdata/xen-ia64-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-hvm.xml
@@ -5,6 +5,12 @@
       <features>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml
index b1f97056bb03a7e06e48a55acd0ee7e7ede0f855..12266dd3bdb83932ce2fa0b8428b852c94ea4bba 100644 (file)
--- a/tests/xencapsdata/xen-ia64.xml
+++ b/tests/xencapsdata/xen-ia64.xml
@@ -5,6 +5,12 @@
       <features>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml
index 1c4a8fa61f8d8337ccca59cded082973fbecfac2..96e566fc89e1675445c8d1485108b2813365709f 100644 (file)
--- a/tests/xencapsdata/xen-ppc64.xml
+++ b/tests/xencapsdata/xen-ppc64.xml
@@ -5,6 +5,12 @@
       <features>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
index df3e3d1c4dacd9ee144e00bc35ede398cc95f377..c7fa802f27ea87f1b114320d855b57a47cf1dc3b 100644 (file)
--- a/tests/xencapsdata/xen-x86_64-hvm.xml
+++ b/tests/xencapsdata/xen-x86_64-hvm.xml
@@ -6,6 +6,12 @@
         <svm/>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml
index 85bd10f5a334eb66940a12442ee076873309a484..7c73d0ece54e07dc58c88b6f40189d21ce5dffcb 100644 (file)
--- a/tests/xencapsdata/xen-x86_64.xml
+++ b/tests/xencapsdata/xen-x86_64.xml
@@ -6,6 +6,12 @@
         <svm/>
       </features>
     </cpu>
+    <migration_features>
+      <live/>
+      <uri_transports>
+        <uri_transport>xenmigr</uri_transport>
+      </uri_transports>
+    </migration_features>
   </host>
 
   <guest>

diff --git a/tests/xencapstest.c b/tests/xencapstest.c
index b81db9c3d62995dc684042387265988d5105c563..418bb7d1f9e2d872f48415702d1d6393dd37ee8a 100644 (file)
--- a/tests/xencapstest.c
+++ b/tests/xencapstest.c
@@ -40,6 +40,7 @@ static int testCompareFiles(const char *hostmachine,
     goto fail;
 
   if (getenv("DEBUG_TESTS")) {
+    printf("In test file %s:\n", capabilities);
     printf("Expect %d '%s'\n", (int)strlen(expectxml), expectxml);
     printf("Actual %d '%s'\n", (int)strlen(actualxml), actualxml);
   }