Migrate tests to tmt

For https://fedoraproject.org/wiki/Changes/DisableSTI

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,11 +1,6 @@
-/gfs2-utils-3.1.0.tar.gz
-/gfs2-utils-3.1.1.tar.gz
-/gfs2-utils-3.1.2.tar.gz
-/gfs2-utils-3.1.3.tar.gz
-/gfs2-utils-3.1.4.tar.gz
-/gfs2-utils-3.1.5.tar.gz
-/gfs2-utils-3.1.6.tar.gz
-/gfs2-utils-3.1.7.tar.gz
-/gfs2-utils-3.1.8.tar.gz
-/gfs2-utils-3.1.9.tar.gz
-/gfs2-utils-3.1.10.tar.gz
+/gfs2-utils-3.3.0.tar.gz
+/gfs2-utils-3.4.0.tar.gz
+/gfs2-utils-3.4.1.tar.gz
+/gfs2-utils-3.5.0.tar.gz
+/gfs2-utils-3.5.1.tar.gz
+/gfs2-utils-3.6.1.tar.gz

gating.yaml

@@ -0,0 +1,15 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

gfs2-utils.spec

@@ -1,24 +1,14 @@
-###############################################################################
-###############################################################################
-##
-##  Copyright (C) 2004-2016 Red Hat, Inc.  All rights reserved.
-##
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
-##
-###############################################################################
-###############################################################################
-
 Name: gfs2-utils
-Version: 3.1.10
-Release: 5%{?dist}
-License: GPLv2+ and LGPLv2+
-Group: System Environment/Kernel
+Version: 3.6.1
+Release: 2%{?dist}
+# Refer to doc/README.licence in the upstream tarball
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
-%{?fedora:Requires: kmod(gfs2.ko) kmod(dlm.ko)}
+%{?fedora:Recommends: kmod(gfs2.ko) kmod(dlm.ko)}
 %endif
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
 BuildRequires: ncurses-devel
 BuildRequires: kernel-headers
 BuildRequires: automake
@@ -30,25 +20,27 @@ BuildRequires: flex
 BuildRequires: libblkid-devel
 BuildRequires: libuuid-devel
 BuildRequires: check-devel
+BuildRequires: bzip2-devel
+BuildRequires: make
 Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
 URL: https://pagure.io/gfs2-utils
 
 %prep
-%setup -q -n gfs2-utils-%{version}
+%autosetup -p1
 
 %build
 ./autogen.sh
 %configure
-make %{_smp_mflags} V=1
+%make_build
 
 %check
 make check || { cat tests/testsuite.log; exit 1; }
 
 %install
-make -C gfs2 install DESTDIR=%{buildroot}
+%make_install
 # Don't ship gfs2_{trace,lockcapture} in this package
-rm -f %{buildroot}/usr/sbin/gfs2_trace
-rm -f %{buildroot}/usr/sbin/gfs2_lockcapture
+rm -f %{buildroot}%{_sbindir}/gfs2_trace
+rm -f %{buildroot}%{_sbindir}/gfs2_lockcapture
 rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8
 rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8
 
@@ -63,17 +55,120 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_sbindir}/gfs2_grow
 %{_sbindir}/gfs2_jadd
 %{_sbindir}/mkfs.gfs2
-%{_sbindir}/gfs2_convert
 %{_sbindir}/gfs2_edit
 %{_sbindir}/tunegfs2
-%{_sbindir}/gfs2_withdraw_helper
 %{_sbindir}/glocktop
+%{_libexecdir}/gfs2_withdraw_helper
 %{_mandir}/man8/*gfs2*
 %{_mandir}/man8/glocktop*
 %{_mandir}/man5/*
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Feb 27 2025 Andrew Price <anprice@redhat.com> - 3.6.1-1
+- New upstream release
+
+* Mon Jan 20 2025 Andrew Price <anprice@redhat.com> - 3.5.1-7
+- Don't hardcode /usr/sbin in the spec
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Apr 11 2023 Andrew Price <anprice@redhat.com> - 3.5.1-1
+- New upstream release
+
+* Thu Feb 09 2023 Andrew Price <anprice@redhat.com> - 3.5.0-1
+- New upstream release
+- Drop all patches
+- Exclude i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+- Migrate to SPDX license identifier
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jun 23 2022 Andrew Price <anprice@redhat.com> - 3.4.1-4
+- gfs2/edit: always use "%s"-style format for printf()-style functions
+- Custom patch to fix a printw() call missed by the above
+  Fixes a build failure due to format-security warnings being treated as errors
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Mar 15 2021 Andrew Price <anprice@redhat.com> - 3.4.1-1
+- New upstream version
+
+* Mon Mar 08 2021 Andrew Price <anprice@redhat.com> - 3.4.0-1
+- New upstream version
+- Update testsuite script
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Sep 03 2020 Andrew Price <anprice@redhat.com> - 3.3.0-2
+- Version bump to enable gating tests
+
+* Tue Sep 01 2020 Andrew Price <anprice@redhat.com> - 3.3.0-1
+- New upstream version
+- Add dependency on bzip2
+- Drop all patches
+- gfs2_withdraw_helper is now in /usr/libexec/
+
+* 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
+
+* Tue Jul 21 2020 Andrew Price <anprice@redhat.com> - 3.2.0-8
+- Use make_build and make_install macros
+  https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+- Remove -C gfs2 - it's a remnant from the cluster.git days
+- Remove unnecessary header notice from spec file
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Feb 04 2019 Andrew Price <anprice@redhat.com> - 3.2.0-5
+- Fix libuuid linking
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 21 2018 Andrew Price <anprice@redhat.com> - 3.2.0-2
+- Recommend the gfs2 and dlm kmods instead of requiring them
+  Resolves: bz#1593411
+
+* Thu May 24 2018 Andrew Price <anprice@redhat.com> - 3.2.0-1
+- New upstream release
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
@@ -178,230 +273,3 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Nov 13 2012 Andrew Price <anprice@redhat.com> - 3.1.5-1
-- New upstream release
-  Removes mount.gfs2, gfs2_tool, gfs2_quota
-- Remove rawhide_transition.patch - now obsolete
-- Update BuildRequires:
-  Change glibc-kernheaders to kernel-headers
-  Add bison and flex
-- Provide a valid url for Source0
-- Add fix_build_on_rawhide.patch to fix a circular dep introduced in
-  bison 2.6, and a make -j race between libgfs2 and gfs2l
-
-* Tue Aug 14 2012 Andrew Price <anprice@redhat.com> - 3.1.4-6
-- Make the kernel-modules-extra requirement Fedora-specific
-  Resolves bz#847955
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Apr 17 2012 Andrew Price <anprice@redhat.com> - 3.1.4-4
-- Remove commented-out sections
-- Clean up some lintian warnings
-- Add dependency on kernel-modules-extra as per bz#811547
-
-* Wed Mar 07 2012 Andrew Price <anprice@redhat.com> - 3.1.4-3
-- Remove redundant postinstall scriptlet
-
-* Thu Feb  2 2012 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.1.4-2
-- make sure to Obsolete gfs2-cluster
-
-* Wed Feb 01 2012 Andrew Price <anprice@redhat.com> - 3.1.4-1
-- New upstream release
-  Adds gfs2_lockgather script
-- Remove gfs2-cluster (commented out for now)
-- Remove dependency on corosynclib-devel and systemd-units
-- Add rawhide_transition.patch to stop gfs_controld from building
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Dec 15 2011 Andrew Price <anprice@redhat.com> - 3.1.3-1
-- New upstream release
-  Bugfixes and improvements to fsck.gfs2
-  Fixes various other bugs
-  Improve strings and translation support
-- Adds gfs2-cluster systemd unit
-- Removes gfs2* init scripts
-
-* Wed Jul 06 2011 Andrew Price <anprice@redhat.com> - 3.1.2-1
-- New upstream release
-  Fixes several bugs
-  Improves translation support
-  Adds savemeta compression
-- Add zlib-devel to BuildRequires
-- Add gettext-devel to BuildRequires
-
-* Wed May 25 2011 Steven Whitehouse <swhiteho@redhat.com> - 3.1.1-3
-- Update wiki URL
-- Remove gfs2_tool and gfs2_quota from package
-
-* Fri Feb 25 2011 Bob Peterson <rpeterso@redhat.com> - 3.1.1-2
-- Bumping release number to keep upgrades consistent.
-
-* Wed Feb 23 2011 Bob Peterson <rpeterso@redhat.com> - 3.1.1-1
-- gfs2_edit savemeta doesn't save all leafs for big directories
-- gfs2_edit improvements
-- fsck.gfs2: can't repair rgrps resulting from gfs_grow->gfs2_convert
-- fsck.gfs2: reports master/root dinodes as unused and fixes bitmap
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Jan 20 2011 Steven Whitehouse <swhiteho@redhat.com> - 3.1.0-4
-- Drop mount.gfs2 and its man page
-- Only list gfs2_tool once in the files list
-
-* Wed Dec  8 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.1.0-3
-- Drop circular dependency on cman
-
-* Fri Dec  3 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.1.0-2
-- gfs2-cluster should Obsoletes/Provides gfs-pcmk
-
-* Tue Sep 30 2010 Steven Whitehouse <swhiteho@redhat.com> - 3.1.0-1
-- Bringing this package back for upstream GFS2
-  Addition of gfs2tune to the utils
-  Merge of gfs_controld from cman
-
-* Thu Jan 22 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 2.03.11-1
-- New upstream release
-  Fix several bugs and drastically improve startup errors.
-
-* Wed Dec 10 2008 Fabio M. Di Nitto <fdinitto@redhat.com> - 2.03.10-1
-- New upstream release
-  Fix several bugs and port gfs1 code to match 2.6.27 kernel.
-
-* Fri Oct 31 2008 Fabio M. Di Nitto <fdinitto@redhat.com> - 2.03.09-1
-- New upstream release
-  Fix rhbz#468966
-  Addresses several security issues similar to CVE-2008-4192 and
-  CVE-2008-4579 after deep code audit from upstream
-- cleanup patches to match 2.6.26 kernel in F-9
-
-* Tue Oct 21 2008 Fabio M. Di Nitto <fdinitto@redhat.com> - 2.03.08-1
-- New upstream release
-  Fix rhbz#460376 CVE-2008-4192
-  Fix rhbz#467386 CVE-2008-4579
-- cleanup/update patches to match 2.6.26 kernel in F-9
-
-* Thu Aug 14 2008 Fabio M. Di Nitto <fdinitto@redhat.com> - 2.03.07-1
-- New upstream release
-- Fix rgmanager startup locking issues
-- Apply patch to include kernel headers from 2.6.26 required to build
-  userland. Userland will run in 2.6.25 compatibility mode
-- Apply patch to keep kernel modules at 2.6.25 (upstream is at 2.6.26)
-  (this patch is purely cosmetic since we don't build kernel modules
-  but keep the source in sync is Good (tm))
-- Cleanup packaging for installed docs and file permissions
-
-* Mon Jul 14 2008 Fabio M. Di Nitto <fdinitto@redhat.com> - 2.03.05-1
-- New upstream release
-- Cleanup installed doc after upstream
-
-* Wed Jun 11 2008 Fabio M. Di Nitto <fdinitto@redhat.com> 2.03.04-1
-- New upstream release
-- Resolves: #446995 #318271 #447378 #445662
-- Update license tags after major upstream cleanup
-- Include COPYRIGHT file
-
-* Fri May 30 2008 Fabio M. Di Nitto <fdinitto@redhat.com> 2.03.03-1
-- New upstream release
-- Fix several build warnings
-- Update spec files to use macros
-- Update Requires to use packages rather than pointing at files
-- Drop BR on kernel-devel since it's not required anymore
-- Update build section to use proper _sysconfdir, libdir and sbindir
-- Avoid abusing cd when we can ask make to do the work for us
-- Remove /usr/sbin from file section. We don't have any file there
-  and we can avoid shipping stuff by mistake
-
-* Mon Apr 14 2008 Steven Whitehouse <swhiteho@redhat.com> 2.03.00-3
-- Fabbione saves the day. We can get rid of the sed stuff after all
-
-* Mon Apr 14 2008 Steven Whitehouse <swhiteho@redhat.com> 2.03.00-1
-- New upstream sources
-- Eric Sandeen's solution to kernel version dep
-
-* Wed Apr 09 2008 Steven Whitehouse <swhiteho@redhat.com> 0.1.25.2.02.01-15
-- Remove obsolete chkconfig patch for initscript
-- Enable parallel make
-- Remove obsolete copy of gfs2_ondisk.h (this should be in glibc-kernheaders)
-
-* Wed Apr 09 2008 Steven Whitehouse <swhiteho@redhat.com> 0.1.25.2.02.01-14
-- Update URL
-- Fix license spec
-
-* Fri Mar 14 2008 Chris Feist <cfeist@redhat.com> 0.1.25.2.02.00-2
-- New upstream sources.
-
-* Tue Jan 16 2007 Chris Feist <cfeist@redhat.com> 0.1.24-1
-- New upstream sources.
-- Resolves: rhbz#222747
-
-* Wed Jan 03 2007 Chris Feist <cfeist@redhat.com> 0.1.24-1
-- Updated sources
-- Resolves: rhbz#218560
-
-* Thu Dec 21 2006 Chris Feist <cfeist@redhat.com> 0.1.23-1
-- Updated sources
-- Resolves: rhbz#218560
-
-* Tue Dec 19 2006 Chris Feist <cfeist@redhat.com> 0.1.22-1
-- New upstream sources.
-- Resolves: rhbz#219878
-
-* Tue Dec 04 2006 Chris Feist <cfeist@redhat.com> 0.1.21-1
-- New upstream sources.
-- Resolves: rhbz#218134 rhbz#215962
-
-* Thu Nov 30 2006 Chris Feist <cfeist@redhat.com> 0.1.19-1
-- New upstream sources.
-- Resolves: rhbz#217798
-
-* Wed Nov 29 2006 Chris Feist <cfeist@redhat.com> 0.1.18-1
-- New upstream sources.
-- Resolves: rhbz#217460
-
-* Thu Oct 26 2006 Chris Feist <cfeist@redhat.com> 0.1.14-1
-- New upstream sources.
-
-* Fri Oct 13 2006 Chris Feist <cfeist@redhat.com> 0.1.12-1
-- New Upstream sources.
-
-* Fri Oct 13 2006 Chris Feist <cfeist@redhat.com> 0.1.10-1
-- New Upstream sources.
-
-* Mon Oct 09 2006 Chris Feist <cfeist@redhat.com> 0.1.9-1
-- New Upstream sources.
-
-* Mon Sep 25 2006 Chris Feist <cfeist@redhat.com> 0.1.8-1
-- New Upstream sources.
-
-* Wed Sep 13 2006 Chris Feist <cfeist@redhat.com> 0.1.7-1
-- New Upstream sources.
-
-* Thu Sep 07 2006 Chris Feist <cfeist@redhat.com> 0.1.6-2
-- Fix typo in uninstall script (turn off gfs2 instead of gfs)
-
-* Mon Aug 28 2006 Chris Feist <cfeist@redhat.com> 0.1.6-1
-- New Upstream sources.
-
-* Tue Aug 22 2006 Chris Feist <cfeist@redhat.com> 0.1.5-1
-- New Upstream sources.
-
-* Mon Aug 14 2006 Chris Feist <cfeist@redhat.com> 0.1.3-0
-- New Upstream sources, use dist tag.
-
-* Fri Jul 14 2006 Chris Feist <cfeist@redhat.com>
-- Rebuild with updated sources
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com>
-- rebuild
-
-* Tue Jun 27 2006 Florian La Roche <laroche@redhat.com>
-- fix typo in preun script
-
-* Fri Jun 09 2006 Chris Feist <cfeist@redhat.com> - 0.1.0-1.fc6.3
-- Initial build of gfs-utils.

plans/testsuite.fmf

@@ -0,0 +1,5 @@
+summary: Run testsuite
+discover:
+  how: fmf
+execute:
+  how: tmt

sources

@@ -1 +1 @@
-SHA512 (gfs2-utils-3.1.10.tar.gz) = 8c6fc6420bac7d787823907c9a7440060eb089f5d16a5ebf97ab51f634ebb532c5e069cbedd3e4cff2ea52d6d318b2afcde55d160305002c9ccc3284aa8ed9e1
+SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346

tests/atlocal

@@ -0,0 +1,8 @@
+GFS_TGT="../../testvol"
+GFS_TGT_SZ=10
+GFS_MKFS="mkfs.gfs2 -O -D"
+
+gfs_max_blocks()
+{
+	printf $((GFS_TGT_SZ*1073741824/$1))
+}

tests/rgrifieldscheck.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+dev=$1
+i=0
+gfs2_edit -p rg 0 $dev | grep rg_data0 > /dev/null 2>&1
+# New fields not present in /usr/include/linux/gfs2_ondisk.h
+test $? = 0 || exit 0
+gfs2_edit -p rindex $dev | while read field rival unused
+do
+	test $field = ri_data0 -o $field = ri_data -o $field = ri_bitbytes || continue
+	rgfield=$(echo $field | sed 's/ri/rg/')
+	rgval=$(gfs2_edit -p rg $i $dev | grep " $rgfield " | awk '{print $2}')
+
+	if test "$rival" != "$rgval"
+	then
+		echo "Bad $rgfield in rg $i: $rgval (expected: $rival)" >&2
+		exit 1
+	fi
+
+	test $field = ri_bitbytes && i=$((i+1))
+done

tests/rgskipcheck.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+dev=$1
+rgcount=$(gfs2_edit -p rgcount $dev | cut -f1 -d' ')
+prevaddr=$(gfs2_edit -p rg 0 $dev | grep ^RG | awk '{print $5}')
+prevskip=0
+for i in `seq 0 $(($rgcount - 1))`; do
+	addr=$(gfs2_edit -p rg $i $dev | grep ^RG | awk '{print $5}')
+	expected=$(($addr - $prevaddr))
+
+	if test $prevskip != $expected; then
+		echo "Bad rg_skip in rg $(($i - 1)): $prevskip (expected: $expected)" >&2
+		exit 1
+	fi
+
+	prevskip=$(gfs2_edit -p rg $i $dev | grep rg_skip | awk '{print $2}')
+	prevaddr=$addr
+done
+

tests/testsuite.fmf

@@ -0,0 +1,2 @@
+summary: Upstream testsuite
+test: ./testsuite