Re: [libvirt] [PATCH 08/12] qemucapabilitiestest: Test all capabilities

Enhance the test to cover all capabilities we probe for rather than testing the flags only. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; ---

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 80f3cd8..1f2d5d7 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c

@@ -134,17 +137,19 @@ testQemuCaps(const void *opaque) if (!(mon = testQemuFeedMonitor(replies, data->xmlopt))) goto cleanup; - if (!(capsExpected = qemuTestParseCapabilities(capsFile))) - goto cleanup; - - if (!(capsActual = virQEMUCapsNew())) - goto cleanup; - - if (virQEMUCapsInitQMPMonitor(capsActual, + if (!(capsActual = virQEMUCapsNew()) || + virQEMUCapsInitQMPMonitor(capsActual, qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; - if (testQemuCapsCompare(capsExpected, capsActual) < 0) + if ((capsExpected = qemuTestParseCapabilities(capsFile)) && + testQemuCapsFlagsCompare(capsExpected, capsActual) < 0)

+ goto cleanup; + + if (!(actual = virQEMUCapsFormatCache(capsActual, 0, 0))) + goto cleanup; + + if (virtTestCompareToFile(actual, capsFile) < 0)

goto cleanup; ret = 0;