From c413098dc8978a756f12e4beaab7f89d6eec3c29 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 21 Aug 2007 09:38:00 +0000
Subject: [PATCH] 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.
---
 ChangeLog                              | 5 +++++
 tests/sexpr2xmltest.c                  | 2 +-
 tests/xencapsdata/xen-i686-pae-hvm.xml | 6 ++++++
 tests/xencapsdata/xen-i686-pae.xml     | 6 ++++++
 tests/xencapsdata/xen-i686.xml         | 6 ++++++
 tests/xencapsdata/xen-ia64-be-hvm.xml  | 6 ++++++
 tests/xencapsdata/xen-ia64-be.xml      | 6 ++++++
 tests/xencapsdata/xen-ia64-hvm.xml     | 6 ++++++
 tests/xencapsdata/xen-ia64.xml         | 6 ++++++
 tests/xencapsdata/xen-ppc64.xml        | 6 ++++++
 tests/xencapsdata/xen-x86_64-hvm.xml   | 6 ++++++
 tests/xencapsdata/xen-x86_64.xml       | 6 ++++++
 tests/xencapstest.c                    | 1 +
 13 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2ec5e6d72d..415c9601ef 100644
--- 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 93d1cd2725..eda1397dbe 100644
--- 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 1c86076e5d..8bff3bd56f 100644
--- 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 d54b1cbe39..03deb989a4 100644
--- 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 fa932a451f..6f25a1d35c 100644
--- 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 598e646d82..426ccfac56 100644
--- 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 507ef762f3..125448a0cb 100644
--- 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 84a06634a1..730db4b0c0 100644
--- 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 b1f97056bb..12266dd3bd 100644
--- 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 1c4a8fa61f..96e566fc89 100644
--- 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 df3e3d1c4d..c7fa802f27 100644
--- 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 85bd10f5a3..7c73d0ece5 100644
--- 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 b81db9c3d6..418bb7d1f9 100644
--- 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);
   }