xfstests: filter new repair/mkfs output for CRCs

This patch it to ensure that xfstests passes on non-crc filesystems
with a CRC enabled userspace.

Filter out the mkfs/xfs_info CRC line from tests that capture the
output of these commands.

Filter out new error noise from xfs_repair that occurs for
xfs_repair as a result of the CRC changes.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/096 b/096
index 237edada97d51efc51d8674287747502d66b1857..5a2273df5e9a6e84e8fd55035b0ea04e0cbaee6c 100755 (executable)
--- a/096
+++ b/096
@@ -85,6 +85,7 @@ _mkfs_filter()
        -e '/inode-paths/d' \
        -e 's/\(log[    ]*=\).*bsize/\1LOG                    bsize/' \
        -e 's/\(realtime[       ]*=\).*extsz/\1REALTIME               extsz/' \
+       -e '/.*crc=/d' \
        -e 's/ *$//' \
    | grep -v parent
 }

diff --git a/206 b/206
index e8bc922557d8bdc679690614b8ca3fc112afe228..e46e6a375f0a13ab0c208f8bffd1a01b7a3122f7 100755 (executable)
--- a/206
+++ b/206
@@ -77,7 +77,8 @@ echo "=== mkfs.xfs ==="
 mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b -llazy-count=0 $tmpfile \
        | sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g" \
                -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-               -e "s/, projid32bit=[0-9]//"
+               -e "s/, projid32bit=[0-9]//" \
+               -e "/.*crc=/d"
 
 mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
 
@@ -85,13 +86,15 @@ mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
 echo "=== xfs_growfs ==="
 xfs_growfs $tmpdir \
        | sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g" \
-               -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
+               -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
+               -e "/.*crc=/d"
 
 # and double-check the new geometry
 echo "=== xfs_info ==="
 xfs_info $tmpdir \
        | sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g" \
-               -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
+               -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
+               -e "/.*crc=/d"
 
 # _cleanup cleans up for us
 

diff --git a/common.repair b/common.repair
index 23a1ed65e0ab36ff4077ebb200cd4099580e84f6..db160bb13236e80c85406089a32259a72e74c3d7 100644 (file)
--- a/common.repair
+++ b/common.repair
@@ -77,6 +77,9 @@ s/\s+- \d+:\d\d:\d\d:.*\n//g;
 /^agi_/ && next; # remove agi counts
 /^sb_/ && next; # remove sb counts
 /^agi unlinked/ && next; # remove agi unlinked bucket warning
+# crc enabled filesystem output
+/XFS_CORRUPTION_ERROR/ && next;
+/^bad uuid/ && next;
        print;'
 }