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

virbitmaptest: Refactor checks in 'test6'

Browse Source 
The 'checkBitmap' helper uses 'virBitmapFormat' internally and also
reports better errors. Use it instead of the open-coded checks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-10-05 12:10:42 +02:00
parent 0128fe1411
commit 297fc39a2d
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/virbitmaptest.c
View File

@ -407,7 +407,6 @@ static int
test6(const void *v G_GNUC_UNUSED) test6(const void *v G_GNUC_UNUSED)
{ {
virBitmapPtr bitmap = NULL; virBitmapPtr bitmap = NULL;
char *str = NULL;
int size = 64; int size = 64;
int ret = -1; int ret = -1;
@ -415,73 +414,42 @@ test6(const void *v G_GNUC_UNUSED)
if (!bitmap) if (!bitmap)
goto error; goto error;
str = virBitmapFormat(bitmap); if (checkBitmap(bitmap, "", -1) < 0)
if (!str)
goto error; goto error;
if (STRNEQ(str, ""))
goto error;
VIR_FREE(str);
ignore_value(virBitmapSetBit(bitmap, 0)); ignore_value(virBitmapSetBit(bitmap, 0));
str = virBitmapFormat(bitmap);
if (!str)
goto error;
if (STRNEQ(str, "0")) if (checkBitmap(bitmap, "0", -1) < 0)
goto error; goto error;
VIR_FREE(str);
ignore_value(virBitmapSetBit(bitmap, 4)); ignore_value(virBitmapSetBit(bitmap, 4));
ignore_value(virBitmapSetBit(bitmap, 5)); ignore_value(virBitmapSetBit(bitmap, 5));
str = virBitmapFormat(bitmap);
if (!str)
goto error;
if (STRNEQ(str, "0,4-5")) if (checkBitmap(bitmap, "0,4-5", -1) < 0)
goto error; goto error;
VIR_FREE(str);
ignore_value(virBitmapSetBit(bitmap, 6)); ignore_value(virBitmapSetBit(bitmap, 6));
str = virBitmapFormat(bitmap);
if (!str)
goto error;
if (STRNEQ(str, "0,4-6")) if (checkBitmap(bitmap, "0,4-6", -1) < 0)
goto error; goto error;
VIR_FREE(str);
ignore_value(virBitmapSetBit(bitmap, 13)); ignore_value(virBitmapSetBit(bitmap, 13));
ignore_value(virBitmapSetBit(bitmap, 14)); ignore_value(virBitmapSetBit(bitmap, 14));
ignore_value(virBitmapSetBit(bitmap, 15)); ignore_value(virBitmapSetBit(bitmap, 15));
ignore_value(virBitmapSetBit(bitmap, 16)); ignore_value(virBitmapSetBit(bitmap, 16));
str = virBitmapFormat(bitmap);
if (!str)
goto error;
if (STRNEQ(str, "0,4-6,13-16")) if (checkBitmap(bitmap, "0,4-6,13-16", -1) < 0)
goto error; goto error;
VIR_FREE(str);
ignore_value(virBitmapSetBit(bitmap, 62)); ignore_value(virBitmapSetBit(bitmap, 62));
ignore_value(virBitmapSetBit(bitmap, 63)); ignore_value(virBitmapSetBit(bitmap, 63));
str = virBitmapFormat(bitmap);
if (!str)
goto error;
if (STRNEQ(str, "0,4-6,13-16,62-63")) if (checkBitmap(bitmap, "0,4-6,13-16,62-63", -1) < 0)
goto error; goto error;
ret = 0; ret = 0;
error: error:
virBitmapFree(bitmap); virBitmapFree(bitmap);
VIR_FREE(str);
return ret; return ret;
} }