From: Dave Chinner <david@fromorbit.com>
To: Eric Sandeen <sandeen@sandeen.net>
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: fstests: update mkfs.xfs filters for new refactoring
Date: Tue, 3 Oct 2017 19:21:34 +1100 [thread overview]
Message-ID: <20171003082134.GJ3666@dastard> (raw)
In-Reply-To: <20171003080607.GM15067@dastard>
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>
---
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.
next prev parent reply other threads:[~2017-10-03 8:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 8:06 [GIT PULL] xfsprogs: mkfs refactor Dave Chinner
2017-10-03 8:21 ` Dave Chinner [this message]
2017-10-03 17:16 ` Darrick J. Wong
2017-10-03 20:07 ` Dave Chinner
2017-10-03 20:14 ` Darrick J. Wong
2017-10-06 18:01 ` Eric Sandeen
2017-10-06 18:18 ` Eric Sandeen
2017-10-09 0:42 ` Dave Chinner
2017-10-09 3:11 ` Eric Sandeen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171003082134.GJ3666@dastard \
--to=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.