xfs
[Top] [All Lists]

[PATCH] xfs/021: filter v5 filesystem metadata

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs/021: filter v5 filesystem metadata
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Wed, 5 Feb 2014 19:03:36 +1100
Delivered-to: xfs@xxxxxxxxxxx
From: Dave Chinner <dchinner@xxxxxxxxxx>

The xfs_db output is different for v5 filesystem metadata, and so
the test fails due to golden image mismatches rather than an actual
test failure. Improve the filter to hide the differences between the
metadata format outputs.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 tests/xfs/021 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/xfs/021 b/tests/xfs/021
index a727b51..a548092 100755
--- a/tests/xfs/021
+++ b/tests/xfs/021
@@ -135,10 +135,19 @@ xfs_db -r -c "inode $inum_1" -c "print a.sfattr" 
$SCRATCH_DEV | \
 
 echo "*** dump attributes (2)"
 
+# There is a fair bit of filtering here to convert v5 filesystem output
+# into the v4 format that holds the meaningful information for the test.
 xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print $SCRATCH_DEV \
        | perl -ne '
 s/,secure//;
 s/,parent//;
+s/info.hdr/info/;
+/hdr.info.crc/ && next;
+/hdr.info.bno/ && next;
+/hdr.info.uuid/ && next;
+/hdr.info.lsn/ && next;
+/hdr.info.owner/ && next;
+s/^(hdr.info.magic =) 0x3bee/\1 0xfbee/;
 s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/;
 s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/;
 s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,local]).*/\1 
[ENTRIES..]/;
-- 
1.8.4.rc3

<Prev in Thread] Current Thread [Next in Thread>