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>
This commit is contained in:
Dave Chinner
2017-10-03 19:21:34 +11:00
committed by Eryu Guan
parent 48d7ba426e
commit 6ba637e0cd
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -81,7 +81,8 @@ _scratch_mkfs_xfs()
{ {
local mkfs_cmd="`_scratch_mkfs_xfs_opts`" local mkfs_cmd="`_scratch_mkfs_xfs_opts`"
local mkfs_filter="sed -e '/less than device physical sector/d' \ 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 tmp=`mktemp -u`
local mkfs_status local mkfs_status
+2 -1
View File
@@ -84,7 +84,8 @@ mkfs_filter()
-e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \ -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \
-e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \ -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \
-e "s/, lazy-count=[0-9]//" \ -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. # mkfs slightly smaller than that, small log for speed.