External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Make schema test fail on XML schema errors

Browse Source 
Failure to parse the schema file would not trigger a test suite failure.

In addition to making the test fail it's necessary to split up the
parsing of the schema file into a separate test.

This is necessary as the XML validator uses libvirt errors to report
problems parsing of the actual schema RNG needs to be split out into a
separate function and called via virTestRun which has the
infrastructure to report them.
This commit is contained in:
Peter Krempa 2016-08-02 09:11:33 +02:00
parent 6293644eb0
commit 27bdc0af00
1 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tests/virschematest.c
View File

@ -114,22 +114,14 @@ testSchemaDir(const char *schema,
static int
testSchemaDirs(const char *schema, ...)
testSchemaDirs(const char *schema, virXMLValidatorPtr validator, ...)
{
virXMLValidatorPtr validator = NULL;
va_list args;
int ret = 0;
char *schema_path = NULL;
char *dir_path = NULL;
const char *dir;
va_start(args, schema);
if (virAsprintf(&schema_path, "%s/docs/schemas/%s", abs_topsrcdir, schema) < 0)
goto cleanup;
if (!(validator = virXMLValidatorInit(schema_path)))
goto cleanup;
va_start(args, validator);
while ((dir = va_arg(args, char *))) {
if (virAsprintf(&dir_path, "%s/%s", abs_srcdir, dir) < 0) {
@ -142,24 +134,59 @@ testSchemaDirs(const char *schema, ...)
}
cleanup:
virXMLValidatorFree(validator);
VIR_FREE(schema_path);
VIR_FREE(dir_path);
va_end(args);
return ret;
}
struct testSchemaFileData {
virXMLValidatorPtr validator;
const char *schema;
};
static int
testSchemaGrammar(const void *opaque)
{
struct testSchemaFileData *data = (struct testSchemaFileData *) opaque;
char *schema_path;
int ret = -1;
if (virAsprintf(&schema_path, "%s/docs/schemas/%s",
abs_topsrcdir, data->schema) < 0)
return -1;
if (!(data->validator = virXMLValidatorInit(schema_path)))
goto cleanup;
ret = 0;
cleanup:
VIR_FREE(schema_path);
return ret;
}
static int
mymain(void)
{
int ret = 0;
struct testSchemaFileData data;
#define DO_TEST(schema, ...) \
do { \
if (testSchemaDirs(schema, __VA_ARGS__, NULL) < 0) \
ret = -1; \
} while (0) \
#define DO_TEST(sch, ...) \
do { \
data.schema = sch; \
if (virTestRun("test schema grammar file: " sch, \
testSchemaGrammar, &data) == 0) { \
if (testSchemaDirs(sch, data.validator, __VA_ARGS__, NULL) < 0) \
ret = -1; \
\
virXMLValidatorFree(data.validator); \
data.validator = NULL; \
} else { \
ret = -1; \
} \
} while (0)
DO_TEST("capability.rng", "capabilityschemadata", "xencapsdata");
DO_TEST("domain.rng", "domainschemadata", "qemuargv2xmldata",