[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 08/14] test-hbitmap: Add non-advancing iter_next
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 08/14] test-hbitmap: Add non-advancing iter_next tests |
Date: |
Wed, 13 Jun 2018 20:18:17 +0200 |
Add a function that wraps hbitmap_iter_next() and always calls it in
non-advancing mode first, and in advancing mode next. The result should
always be the same.
By using this function everywhere we called hbitmap_iter_next() before,
we should get good test coverage for non-advancing hbitmap_iter_next().
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
tests/test-hbitmap.c | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c
index f2158f767d..5e67ac1d3a 100644
--- a/tests/test-hbitmap.c
+++ b/tests/test-hbitmap.c
@@ -30,6 +30,18 @@ typedef struct TestHBitmapData {
} TestHBitmapData;
+static int64_t check_hbitmap_iter_next(HBitmapIter *hbi)
+{
+ int next0, next1;
+
+ next0 = hbitmap_iter_next(hbi, false);
+ next1 = hbitmap_iter_next(hbi, true);
+
+ g_assert_cmpint(next0, ==, next1);
+
+ return next0;
+}
+
/* Check that the HBitmap and the shadow bitmap contain the same data,
* ignoring the same "first" bits.
*/
@@ -46,7 +58,7 @@ static void hbitmap_test_check(TestHBitmapData *data,
i = first;
for (;;) {
- next = hbitmap_iter_next(&hbi, true);
+ next = check_hbitmap_iter_next(&hbi);
if (next < 0) {
next = data->size;
}
@@ -435,25 +447,25 @@ static void test_hbitmap_iter_granularity(TestHBitmapData
*data,
/* Note that hbitmap_test_check has to be invoked manually in this test.
*/
hbitmap_test_init(data, 131072 << 7, 7);
hbitmap_iter_init(&hbi, data->hb, 0);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 0);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), <, 0);
hbitmap_test_set(data, ((L2 + L1 + 1) << 7) + 8, 8);
hbitmap_iter_init(&hbi, data->hb, 0);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), ==, (L2 + L1 + 1) << 7);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 0);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), ==, (L2 + L1 + 1) << 7);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), <, 0);
hbitmap_iter_init(&hbi, data->hb, (L2 + L1 + 2) << 7);
g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 0);
hbitmap_test_set(data, (131072 << 7) - 8, 8);
hbitmap_iter_init(&hbi, data->hb, 0);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), ==, (L2 + L1 + 1) << 7);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), ==, 131071 << 7);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 0);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), ==, (L2 + L1 + 1) << 7);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), ==, 131071 << 7);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), <, 0);
hbitmap_iter_init(&hbi, data->hb, (L2 + L1 + 2) << 7);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), ==, 131071 << 7);
- g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 0);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), ==, 131071 << 7);
+ g_assert_cmpint(check_hbitmap_iter_next(&hbi), <, 0);
}
static void hbitmap_test_set_boundary_bits(TestHBitmapData *data, ssize_t diff)
@@ -893,7 +905,7 @@ static void test_hbitmap_serialize_zeroes(TestHBitmapData
*data,
for (i = 0; i < num_positions; i++) {
hbitmap_deserialize_zeroes(data->hb, positions[i], min_l1, true);
hbitmap_iter_init(&iter, data->hb, 0);
- next = hbitmap_iter_next(&iter, true);
+ next = check_hbitmap_iter_next(&iter);
if (i == num_positions - 1) {
g_assert_cmpint(next, ==, -1);
} else {
@@ -919,10 +931,10 @@ static void test_hbitmap_iter_and_reset(TestHBitmapData
*data,
hbitmap_iter_init(&hbi, data->hb, BITS_PER_LONG - 1);
- hbitmap_iter_next(&hbi, true);
+ check_hbitmap_iter_next(&hbi);
hbitmap_reset_all(data->hb);
- hbitmap_iter_next(&hbi, true);
+ check_hbitmap_iter_next(&hbi);
}
static void test_hbitmap_next_zero_check(TestHBitmapData *data, int64_t start)
--
2.17.1
- [Qemu-devel] [PATCH v5 00/14] block/mirror: Add active-sync mirroring, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 01/14] block/mirror: Pull out mirror_perform(), Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 03/14] block/mirror: Use CoQueue to wait on in-flight ops, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 02/14] block/mirror: Convert to coroutines, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 04/14] block/mirror: Wait for in-flight op conflicts, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 05/14] block/mirror: Use source as a BdrvChild, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 06/14] block: Generalize should_update_child() rule, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 07/14] hbitmap: Add @advance param to hbitmap_iter_next(), Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 08/14] test-hbitmap: Add non-advancing iter_next tests,
Max Reitz <=
- [Qemu-devel] [PATCH v5 09/14] block/dirty-bitmap: Add bdrv_dirty_iter_next_area, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 10/14] block/mirror: Add MirrorBDSOpaque, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 11/14] job: Add job_progress_increase_remaining(), Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 12/14] block/mirror: Add active mirroring, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 13/14] block/mirror: Add copy mode QAPI interface, Max Reitz, 2018/06/13
- [Qemu-devel] [PATCH v5 14/14] iotests: Add test for active mirroring, Max Reitz, 2018/06/13
- Re: [Qemu-devel] [PATCH v5 00/14] block/mirror: Add active-sync mirroring, Max Reitz, 2018/06/18