From 110b95d573d8f91ee13b8cd906de81b16f8e1dbe Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 5 Oct 2020 11:17:38 +0200 Subject: [PATCH] virbitmaptest: Split up test12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'test12' was testing two distinct operations on two instances of a bitmap. Split it up into 'test12a' and 'test12b' so that the 'bitmap' variable is not reused. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/virbitmaptest.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 687b5f87af..32187ebec4 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -629,7 +629,7 @@ test11(const void *opaque) /* test self-expanding bitmap APIs */ static int -test12(const void *opaque G_GNUC_UNUSED) +test12a(const void *opaque G_GNUC_UNUSED) { virBitmapPtr map = virBitmapNewEmpty(); int ret = -1; @@ -646,7 +646,20 @@ test12(const void *opaque G_GNUC_UNUSED) TEST_MAP(151, "128"); + ret = 0; + + cleanup: virBitmapFree(map); + return ret; +} + + +static int +test12b(const void *opaque G_GNUC_UNUSED) +{ + virBitmapPtr map = virBitmapNewEmpty(); + int ret = -1; + if (!(map = virBitmapParseUnlimited("34,1023"))) goto cleanup; @@ -829,7 +842,9 @@ mymain(void) TESTBINARYOP("0-3", "0,^0", "0,^0", test11); TESTBINARYOP("0,2", "1,3", "0,^0", test11); - if (virTestRun("test12", test12, NULL) < 0) + if (virTestRun("test12a", test12a, NULL) < 0) + ret = -1; + if (virTestRun("test12b", test12b, NULL) < 0) ret = -1; if (virTestRun("test13", test13, NULL) < 0) ret = -1;