* Wed Jul 29 2020 Andrew Price <anprice@redhat.com> - 3.2.0-10

- tests: Don't use fail_unless in unit tests
  Fixes build failures due to a regression in check-devel

2-tests_Don_t_use_fail_unless_in_unit_tests.patch

@@ -0,0 +1,74 @@
+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
+ 

gfs2-utils.spec

@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -21,6 +21,7 @@ Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
 URL: https://pagure.io/gfs2-utils
 Patch0: 0-Fix_libuuid_linking.patch
 Patch1: 1-Fix_more_linking_errors.patch
+Patch2: 2-tests_Don_t_use_fail_unless_in_unit_tests.patch
 
 %prep
 %autosetup -p1
@@ -63,6 +64,10 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Wed Jul 29 2020 Andrew Price <anprice@redhat.com> - 3.2.0-10
+- tests: Don't use fail_unless in unit tests
+  Fixes build failures due to a regression in check-devel
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild