public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: "Theodore Ts'o" <tytso@mit.edu>
To: fstests@vger.kernel.org
Cc: Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 4/4] common: filter warning messages from mkfs.ext4
Date: Sun, 21 Feb 2016 23:26:11 -0500	[thread overview]
Message-ID: <1456115171-13191-5-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1456115171-13191-1-git-send-email-tytso@mit.edu>

Commit 4a5cda8102828 ("xfstests: do not unmount tmpfs during remount")
changed generic/135 to no longer redirect stderr to /dev/null when
running _scratch_mkfs.  This caused ext4 using a 1k block size to fail
when running this test because mkfs.ext4 would issue a warning message
about the use of a non-block size that wasn't expected by golden
output for the test.  Fix this by filtering out warning messages in
_scratch_mkfs_ext4.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index f07b274..5fb3282 100644
--- a/common/rc
+++ b/common/rc
@@ -655,7 +655,7 @@ _scratch_mkfs_ext4()
 	fi
 
 	# output stored mkfs output
-	cat $tmp_dir.mkfserr >&2
+	grep -v ^Warning: $tmp_dir.mkfserr >&2
 	cat $tmp_dir.mkfsstd
 	rm -f $tmp_dir.mkfserr $tmp_dir.mkfsstd
 
-- 
2.5.0


  parent reply	other threads:[~2016-02-22  4:26 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-22  4:26 [PATCH 0/4] Remaining patches to fix up tmpfs testing Theodore Ts'o
2016-02-22  4:26 ` [PATCH 1/4] xfstests: remove dependency on /proc/partitions for generic/312 Theodore Ts'o
2016-02-22  7:37   ` Christoph Hellwig
2016-02-22  4:26 ` [PATCH 2/4] generic: add _require_odirect for generic/125 Theodore Ts'o
2016-02-22  7:37   ` Christoph Hellwig
2016-02-22  4:26 ` [PATCH 3/4] defrag: require extents support for ext4 defrag Theodore Ts'o
2016-02-22  7:37   ` Christoph Hellwig
2016-02-22  4:26 ` Theodore Ts'o [this message]
2016-02-22  7:38   ` [PATCH 4/4] common: filter warning messages from mkfs.ext4 Christoph Hellwig

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=1456115171-13191-5-git-send-email-tytso@mit.edu \
    --to=tytso@mit.edu \
    --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