FS/XFS testing framework
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: fstests@vger.kernel.org
Subject: [PATCH] xfs/096: strip log stripe warnings from mkfs.xfs
Date: Thu, 20 Nov 2014 11:01:18 +1100	[thread overview]
Message-ID: <1416441678-13445-1-git-send-email-david@fromorbit.com> (raw)

From: Dave Chinner <dchinner@redhat.com>

The warnings have been removed when stripe unit/width are too big
for the log stripe unit to be set. Hence add them to the mkfs.xfs
filter and strip them from golden output file so the test succeeds
on both new and old mfks binaries.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 tests/xfs/096          | 1 +
 tests/xfs/096.external | 2 --
 tests/xfs/096.internal | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/xfs/096 b/tests/xfs/096
index b2719bc..0179e77 100755
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -88,6 +88,7 @@ _mkfs_filter()
 	-e '/.*crc=/d' \
 	-e 's/ *$//' \
 	-e 's/ ftype=[01]//' \
+	-e '/^log stripe unit/d' \
    | grep -v parent
 }
 
diff --git a/tests/xfs/096.external b/tests/xfs/096.external
index 9175904..95833c8 100644
--- a/tests/xfs/096.external
+++ b/tests/xfs/096.external
@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096)
 
 # test log stripe greater than LR size
 --- mkfs=-l version=2,su=266240 ---
-log stripe unit (266240 bytes) is too large (maximum is 256KiB)
-log stripe unit adjusted to 32KiB
 meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=N
          =                       sunit=0      swidth=0 blks, unwritten=1
diff --git a/tests/xfs/096.internal b/tests/xfs/096.internal
index cf75037..7bf848c 100644
--- a/tests/xfs/096.internal
+++ b/tests/xfs/096.internal
@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096)
 
 # test log stripe greater than LR size
 --- mkfs=-l version=2,su=266240 ---
-log stripe unit (266240 bytes) is too large (maximum is 256KiB)
-log stripe unit adjusted to 32KiB
 meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=N
          =                       sunit=0      swidth=0 blks, unwritten=1
@@ -20,8 +18,6 @@ realtime =REALTIME               extsz=N, blocks=N, rtextents=N
 
 # same test but get log stripe from data stripe
 --- mkfs=-l version=2 -d su=266240,sw=1 ---
-log stripe unit (266240 bytes) is too large (maximum is 256KiB)
-log stripe unit adjusted to 32KiB
 meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=N
          =                       sunit=65     swidth=65 blks, unwritten=1
-- 
2.0.0


             reply	other threads:[~2014-11-20  0:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-20  0:01 Dave Chinner [this message]
2014-11-20  0:04 ` [PATCH] xfs/096: strip log stripe warnings from mkfs.xfs Dave Chinner

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=1416441678-13445-1-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --cc=fstests@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox