From: Peter Krempa Date: Tue, 15 Aug 2023 12:20:58 +0000 (+0200) Subject: virschematest: Improve detection of 'invalid' XMLs X-Git-Tag: v9.7.0-rc1~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2dfc3b8636528da8a0aad4a97b4964d20830335;p=thirdparty%2Flibvirt.git virschematest: Improve detection of 'invalid' XMLs The output files from 'qemuxml2argvtest' may have the real capability suffix e.g. 'pci-rom-disabled-invalid.x86_64-latest.xml' which would not be detected as being invalid and thus causing a test failure. Change the logic to find '-invalid.' so that we can properly use 'virschematest' with test cases using real capabilities. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/tests/virschematest.c b/tests/virschematest.c index fcf3838630..c8c1527613 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -48,7 +48,9 @@ static int testSchemaValidateXML(const void *args) { const struct testSchemaData *data = args; - bool shouldFail = virStringHasSuffix(data->xml_path, "-invalid.xml"); + /* invalid XMLs have a '-invalid.' suffix, but not necessarily at the end + * of the file name e.g. in case of qemuxml2xmltest with real capabilities */ + bool shouldFail = !!strstr(data->xml_path, "-invalid."); g_autoptr(xmlDoc) xml = NULL; if (!(xml = virXMLParseFileCtxt(data->xml_path, NULL)))