diff -urN gfs2-utils-3.2.0/tests/check_meta.c gfs2-utils-3.2.0.patched/tests/check_meta.c --- gfs2-utils-3.2.0/tests/check_meta.c 2018-05-23 21:04:16.000000000 +0100 +++ gfs2-utils-3.2.0.patched/tests/check_meta.c 2020-07-29 13:19:28.548734314 +0100 @@ -6,7 +6,7 @@ START_TEST(test_lgfs2_meta) { - fail_unless(lgfs2_selfcheck() == 0); + ck_assert(lgfs2_selfcheck() == 0); } END_TEST diff -urN gfs2-utils-3.2.0/tests/check_rgrp.c gfs2-utils-3.2.0.patched/tests/check_rgrp.c --- gfs2-utils-3.2.0/tests/check_rgrp.c 2018-05-23 21:04:16.000000000 +0100 +++ gfs2-utils-3.2.0.patched/tests/check_rgrp.c 2020-07-29 13:19:28.548734314 +0100 @@ -16,7 +16,7 @@ uint32_t rgsize = (1024 << 20) / 4096; sdp = calloc(1, sizeof(*sdp)); - fail_unless(sdp != NULL); + ck_assert(sdp != NULL); sdp->device.length = rgsize + 20; sdp->device_fd = -1; @@ -24,7 +24,7 @@ compute_constants(sdp); rgs = lgfs2_rgrps_init(sdp, 0, 0); - fail_unless(rgs != NULL); + ck_assert(rgs != NULL); lgfs2_rgrps_plan(rgs, sdp->device.length - 16, rgsize); @@ -32,11 +32,11 @@ ck_assert(addr != 0); rg = lgfs2_rgrps_append(rgs, &ri, 0); - fail_unless(rg != NULL); + ck_assert(rg != NULL); for (i = 0; i < rg->ri.ri_length; i++) { rg->bits[i].bi_bh = bget(sdp, rg->ri.ri_addr + i); - fail_unless(rg->bits[i].bi_bh != NULL); + ck_assert(rg->bits[i].bi_bh != NULL); } return rgs; } @@ -44,7 +44,7 @@ START_TEST(test_mockup_rgrp) { lgfs2_rgrps_t rgs = mockup_rgrp(); - fail_unless(rgs != NULL); + ck_assert(rgs != NULL); } END_TEST @@ -66,7 +66,7 @@ ck_assert_int_eq(err, 0); addr = lgfs2_rbm_to_block(&rbm); - fail_unless(addr == rbm.rgd->ri.ri_data0); + ck_assert(addr == rbm.rgd->ri.ri_data0); } } END_TEST @@ -110,7 +110,7 @@ ck_assert_int_eq(err, 0); addr = lgfs2_rbm_to_block(&rbm); - fail_unless(addr == (rg->ri.ri_data0 + rg->ri.ri_data - 1)); + ck_assert(addr == (rg->ri.ri_data0 + rg->ri.ri_data - 1)); } END_TEST