Commit 4294c4ab authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

Revert "test-hbitmap: Add non-advancing iter_next tests" 



This reverts commit 26957684.

The functionality is unused. Drop tests.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
parent 166cd551

tests/test-hbitmap.c

+12 −24
Original line number Diff line number Diff line
@@ -30,18 +30,6 @@ 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.

 */
@@ -58,7 +46,7 @@ static void hbitmap_test_check(TestHBitmapData *data, 


    i = first;

    for (;;) {

        next = check_hbitmap_iter_next(&hbi);

        next = hbitmap_iter_next(&hbi, true);

        if (next < 0) {

            next = data->size;

        }
@@ -447,25 +435,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(check_hbitmap_iter_next(&hbi), <, 0);

    g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 0);



    hbitmap_test_set(data, ((L2 + L1 + 1) << 7) + 8, 8);

    hbitmap_iter_init(&hbi, data->hb, 0);

    g_assert_cmpint(check_hbitmap_iter_next(&hbi), ==, (L2 + L1 + 1) << 7);

    g_assert_cmpint(check_hbitmap_iter_next(&hbi), <, 0);

    g_assert_cmpint(hbitmap_iter_next(&hbi, true), ==, (L2 + L1 + 1) << 7);

    g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 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(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);

    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);



    hbitmap_iter_init(&hbi, data->hb, (L2 + L1 + 2) << 7);

    g_assert_cmpint(check_hbitmap_iter_next(&hbi), ==, 131071 << 7);

    g_assert_cmpint(check_hbitmap_iter_next(&hbi), <, 0);

    g_assert_cmpint(hbitmap_iter_next(&hbi, true), ==, 131071 << 7);

    g_assert_cmpint(hbitmap_iter_next(&hbi, true), <, 0);

}



static void hbitmap_test_set_boundary_bits(TestHBitmapData *data, ssize_t diff)
@@ -905,7 +893,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 = check_hbitmap_iter_next(&iter);

        next = hbitmap_iter_next(&iter, true);

        if (i == num_positions - 1) {

            g_assert_cmpint(next, ==, -1);

        } else {
@@ -931,10 +919,10 @@ static void test_hbitmap_iter_and_reset(TestHBitmapData *data, 


    hbitmap_iter_init(&hbi, data->hb, BITS_PER_LONG - 1);



    check_hbitmap_iter_next(&hbi);

    hbitmap_iter_next(&hbi, true);



    hbitmap_reset_all(data->hb);

    check_hbitmap_iter_next(&hbi);

    hbitmap_iter_next(&hbi, true);

}



static void test_hbitmap_next_zero_check_range(TestHBitmapData *data,