External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemufirmwaretest: Produce better message on error

Browse Source 
If qemuFirmwareFetchConfigs() returned more or fewer paths than
expected all that we see is the following error message:

  Expected 5 paths, got 7

While it is technically correct (the best kind of correct), we
can do better:

  Unexpected path (i=0). Expected /some/path got /some/other/path

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Michal Privoznik 2019-03-26 08:57:33 +01:00
parent 34086fc59e
commit c34b3eefdf
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/qemufirmwaretest.c
View File

@ -66,6 +66,7 @@ testFWPrecedence(const void *opaque ATTRIBUTE_UNUSED)
PREFIX "/share/qemu/firmware/61-ovmf.json", PREFIX "/share/qemu/firmware/61-ovmf.json",
PREFIX "/share/qemu/firmware/70-aavmf.json", PREFIX "/share/qemu/firmware/70-aavmf.json",
}; };
const size_t nexpected = ARRAY_CARDINALITY(expected);
if (VIR_STRDUP(fakehome, abs_srcdir "/qemufirmwaredata/home/user/.config") < 0) if (VIR_STRDUP(fakehome, abs_srcdir "/qemufirmwaredata/home/user/.config") < 0)
return -1; return -1;
@ -81,17 +82,15 @@ testFWPrecedence(const void *opaque ATTRIBUTE_UNUSED)
} }
nfwList = virStringListLength((const char **)fwList); nfwList = virStringListLength((const char **)fwList);
if (nfwList != ARRAY_CARDINALITY(expected)) {
fprintf(stderr, "Expected %zu paths, got %zu\n",
ARRAY_CARDINALITY(expected), nfwList);
return -1;
}
for (i = 0; i < ARRAY_CARDINALITY(expected); i++) { for (i = 0; i < MAX(nfwList, nexpected); i++) {
if (STRNEQ_NULLABLE(expected[i], fwList[i])) { const char *e = i < nexpected ? expected[i] : NULL;
const char *f = i < nfwList ? fwList[i] : NULL;
if (STRNEQ_NULLABLE(e, f)) {
fprintf(stderr, fprintf(stderr,
"Unexpected path (i=%zu). Expected %s got %s \n", "Unexpected path (i=%zu). Expected %s got %s \n",
i, expected[i], NULLSTR(fwList[i])); i, NULLSTR(e), NULLSTR(f));
return -1; return -1;
} }
} }