fstests: update mkfs.xfs filters for new refactoring

From: Dave Chinner <dchinner@redhat.com>

The new mkfs code adds some output to indicate where the defaults
were sourced from, so filter that out so it doesn't contaminate
tests unnecessarily.

Signed-Off-By: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/xfs b/common/xfs
index c869aaca45128837cb866c648b9dae383f534f0c..93eb50394984cb09d31151d80b10de7fc54f878d 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -81,7 +81,8 @@ _scratch_mkfs_xfs()
 {
        local mkfs_cmd="`_scratch_mkfs_xfs_opts`"
        local mkfs_filter="sed -e '/less than device physical sector/d' \
-                              -e '/switching to logical sector/d'"
+                              -e '/switching to logical sector/d' \
+                              -e '/Default configuration/d'"
        local tmp=`mktemp -u`
        local mkfs_status
 

diff --git a/tests/xfs/206 b/tests/xfs/206
index 70997e3fe83e6a6d91a609db279398fe091df84a..01782b7b93a92c16e1c7330340aec8926012a78b 100755 (executable)
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -84,7 +84,8 @@ mkfs_filter()
            -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512   /" \
            -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \
            -e "s/, lazy-count=[0-9]//" \
-           -e "/.*crc=/d"
+           -e "/.*crc=/d" \
+           -e "/^Default configuration/d"
 }
 
 # mkfs slightly smaller than that, small log for speed.