fstests: update mkfs.xfs filters for new refactoring
From: Dave Chinner <dchinner@xxxxxxxxxx>
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@xxxxxxxxxx>
---
common/xfs | 3 ++-
tests/xfs/206 | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/xfs b/common/xfs
index def28bfc7309..603792092060 100644
--- 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 70997e3fe83e..01782b7b93a9 100755
--- 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
