[PATCH 09/12] tests: qemuxml2xml: Use standard file comparison helpers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This also makes VIR_TEST_REGENERATE_OUTPUT work
---
 tests/qemuxml2xmltest.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index f967ceb..e3bd9c2 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -43,7 +43,7 @@ static int
 testXML2XMLHelper(const char *inxml,
                   const char *inXmlData,
                   const char *outxml,
-                  const char *outXmlData,
+                  const char *outXmlData ATTRIBUTE_UNUSED,
                   bool live)
 {
     char *actual = NULL;
@@ -66,10 +66,8 @@ testXML2XMLHelper(const char *inxml,
     if (!(actual = virDomainDefFormat(def, format_flags)))
         goto fail;
 
-    if (STRNEQ(outXmlData, actual)) {
-        virtTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
+    if (virtTestCompareToFile(actual, outxml) < 0)
         goto fail;
-    }
 
     ret = 0;
 
-- 
2.5.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]