xfs/206: filter out reflink related outputs

Commit 13717ffc96fe ("xfs/206: fix output when mkfs knows about
reflink") added extra lines to xfs/206.out to fit the mkfs output with
reflink support, but broke tests without reflink support.

Fix it by filtering out reflink related outputs, just like filtering out
crc related outputs in the test.

Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/xfs/206 b/tests/xfs/206
index 24e690ad31955cb4b50d8f4f0358f4288de967d7..d549a4cc13cddec943269deab91c77e41c050f79 100755 (executable)
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -80,7 +80,7 @@ mkfs_filter()
            -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
            -e "s/, projid32bit=[0-9]//" \
            -e "s/ ftype=[0-9]//" \
-           -e "s/ reflink=[0-9]//" \
+           -e "/.*reflink=/d" \
            -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512   /" \
            -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \
            -e "s/, lazy-count=[0-9]//" \

diff --git a/tests/xfs/206.out b/tests/xfs/206.out
index e73a9541448a1fd1213dc68a7f6031d6caaf5d9f..2db839d0856ce1f24274266249aa5c57919ca325 100644 (file)
--- a/tests/xfs/206.out
+++ b/tests/xfs/206.out
@@ -12,7 +12,6 @@ realtime =none                   extsz=4096   blocks=0, rtextents=0
 === xfs_growfs ===
 meta-data=FILE isize=N    agcount=52, agsize=76288719 blks
          =                       sectsz=512   attr=2
-         =                      
 data     =                       bsize=4096   blocks=3905982455, imaxpct=5
          =                       sunit=0      swidth=0 blks
 naming   =version 2              bsize=4096   ascii-ci=0
@@ -23,7 +22,6 @@ data blocks changed from 3905982455 to 4882478016
 === xfs_info ===
 meta-data=FILE isize=N    agcount=64, agsize=76288719 blks
          =                       sectsz=512   attr=2
-         =                      
 data     =                       bsize=4096   blocks=4882478016, imaxpct=5
          =                       sunit=0      swidth=0 blks
 naming   =version 2              bsize=4096   ascii-ci=0