On 04/23/2015 02:19 PM, Cole Robinson wrote:
--- tests/bhyvexml2xmltest.c | 9 ++------- tests/domainconftest.c | 7 +------ tests/lxcxml2xmltest.c | 8 ++------ tests/networkxml2conftest.c | 7 +------ tests/networkxml2xmltest.c | 6 +----- tests/networkxml2xmlupdatetest.c | 6 +----- tests/nwfilterxml2xmltest.c | 6 +----- tests/qemuagenttest.c | 9 ++------- tests/secretxml2xmltest.c | 6 +----- tests/securityselinuxlabeltest.c | 7 +------ tests/storagebackendsheepdogtest.c | 20 +++----------------- tests/storagepoolxml2xmltest.c | 6 +----- tests/storagevolxml2argvtest.c | 26 ++++---------------------- tests/storagevolxml2xmltest.c | 12 ++---------- tests/xlconfigtest.c | 9 ++------- tests/xmconfigtest.c | 9 ++------- tests/xml2sexprtest.c | 9 ++------- tests/xml2vmxtest.c | 9 ++------- 18 files changed, 31 insertions(+), 140 deletions(-)
diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 2e742cf..740c957 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -14,20 +14,16 @@ static bhyveConn driver; static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml) { - char *inXmlData = NULL; char *outXmlData = NULL; char *actual = NULL; virDomainDefPtr def = NULL; int ret = -1;
- if (virtTestLoadFile(inxml, &inXmlData) < 0) - goto fail; - if (virtTestLoadFile(outxml, &outXmlData) < 0) goto fail;
- if (!(def = virDomainDefParseString(inXmlData, driver.caps, driver.xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(def = virDomainDefParseFile(inxml, driver.caps, driver.xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE)))
You'll see a minor conflict here due to a recent change pushed upstream. ACK.