External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virschematest: Add regex filtering for directory contents

Browse Source 
In some cases we have directories with mixed XML files in the test
suite. Adding regex filtering will allow testing subsets of the XML
files against schema.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-10-06 17:25:52 +02:00
parent 837633afb9
commit 873d484190
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/virschematest.c
View File

@ -32,6 +32,10 @@ VIR_LOG_INIT("tests.schematest");
struct testSchemaEntry {
const char *dir;
/* if dirRegex is non-NULL the provided regular expression is used to match
* the file names in a directory (without path prefixed) and only matching
* files are validated */
const char *dirRegex;
const char *file;
};
@ -79,18 +83,29 @@ testSchemaFile(const char *schema,
static int
testSchemaDir(const char *schema,
virXMLValidatorPtr validator,
const char *dir_path)
const char *dir_path,
const char *filterstr)
{
DIR *dir = NULL;
struct dirent *ent;
int ret = 0;
int rc;
g_autoptr(GRegex) filter = NULL;
if (virDirOpen(&dir, dir_path) < 0) {
virTestPropagateLibvirtError();
return -1;
}
if (filterstr) {
g_autoptr(GError) err = NULL;
if (!(filter = g_regex_new(filterstr, 0, 0, &err))) {
VIR_TEST_VERBOSE("\nfailed to compile regex '%s': %s", filterstr, err->message);
return -1;
}
}
while ((rc = virDirRead(dir, &ent, dir_path)) > 0) {
g_autofree char *xml_path = NULL;
@ -98,6 +113,9 @@ testSchemaDir(const char *schema,
continue;
if (ent->d_name[0] == '.')
continue;
if (filter &&
!g_regex_match(filter, ent->d_name, 0, NULL))
continue;
xml_path = g_strdup_printf("%s/%s", dir_path, ent->d_name);
@ -176,7 +194,7 @@ testSchemaEntries(const char *schema,
if (entry->dir) {
g_autofree char *path = g_strdup_printf("%s/%s", abs_top_srcdir, entry->dir);
if (testSchemaDir(schema, validator, path) < 0)
if (testSchemaDir(schema, validator, path, entry->dirRegex) < 0)
ret = -1;
}