gfs2-utils: master - gfs2-utils/tests: Fix unit tests for older check libraries

[Andrew Price]

Gitweb:        http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=77322cb8c8d...
Commit:        77322cb8c8d4a87a52cfeb6db781ac30da0b2edb
Parent:        58bf864d8a6da5a1013280c767ec166c28cbcf55
Author:        Andrew Price 
AuthorDate:    Fri Feb 20 10:56:07 2015 +0000
Committer:     Andrew Price 
CommitterDate: Fri Feb 20 10:56:07 2015 +0000

gfs2-utils/tests: Fix unit tests for older check libraries

ck_assert_ptr_ne() and ck_assert_uint_eq() appeared some time after
RHEL7 was released and the only value they add is some prettier output
when they fail. Replace calls to these functions with fail_unless() to
ensure check_rgrp.c builds on a wider range of environments.

Signed-off-by: Andrew Price 
---
 tests/check_rgrp.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/check_rgrp.c b/tests/check_rgrp.c
index e5fca8d..792b3ae 100644
--- a/tests/check_rgrp.c
+++ b/tests/check_rgrp.c
@@ -16,7 +16,7 @@ static lgfs2_rgrps_t mockup_rgrp(void)
    uint32_t rgsize = (1024 << 20) / 4096;

sdp = calloc(1, sizeof(*sdp));
-	ck_assert_ptr_ne(sdp, NULL);
+	fail_unless(sdp != NULL);

sdp->device.length = rgsize + 20;
    sdp->device_fd = -1;
@@ -24,7 +24,7 @@ static lgfs2_rgrps_t mockup_rgrp(void)
    compute_constants(sdp);

rgs = lgfs2_rgrps_init(sdp, 0, 0);
-	ck_assert_ptr_ne(rgs, NULL);
+	fail_unless(rgs != NULL);

lgfs2_rgrps_plan(rgs, sdp->device.length - 16, rgsize);

@@ -32,11 +32,11 @@ static lgfs2_rgrps_t mockup_rgrp(void)
    ck_assert(addr != 0);

rg = lgfs2_rgrps_append(rgs, &ri);
-	ck_assert_ptr_ne(rg, NULL);
+	fail_unless(rg != NULL);

for (i = 0; i < rg->ri.ri_length; i++) {
    	rg->bits[i].bi_bh = bget(sdp, rg->ri.ri_addr + i);
-		ck_assert_ptr_ne(rg->bits[i].bi_bh, NULL);
+		fail_unless(rg->bits[i].bi_bh != NULL);
    }
    return rgs;
 }
@@ -44,7 +44,7 @@ static lgfs2_rgrps_t mockup_rgrp(void)
 START_TEST(test_mockup_rgrp)
 {
    lgfs2_rgrps_t rgs = mockup_rgrp();
-	ck_assert_ptr_ne(rgs, NULL);
+	fail_unless(rgs != NULL);
 }
 END_TEST

@@ -66,7 +66,7 @@ START_TEST(test_rbm_find_good)
    	ck_assert_int_eq(err, 0);

addr = lgfs2_rbm_to_block(&rbm);
-		ck_assert_uint_eq(addr, rbm.rgd->ri.ri_data0);
+		fail_unless(addr == rbm.rgd->ri.ri_data0);
    }
 }
 END_TEST
@@ -110,7 +110,7 @@ START_TEST(test_rbm_find_lastblock)
    ck_assert_int_eq(err, 0);

addr = lgfs2_rbm_to_block(&rbm);
-	ck_assert_uint_eq(addr, rg->ri.ri_data0 + rg->ri.ri_data - 1);
+	fail_unless(addr == (rg->ri.ri_data0 + rg->ri.ri_data - 1));
 }
 END_TEST