From: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
To: fstests@vger.kernel.org
Cc: tytso@mit.edu, Harshad Shirwadkar <harshads@google.com>,
Harshad Shirwadkar <harshadshirwadkar@gmail.com>
Subject: [PATCH] ext4: add empty lines to mkfs_filter
Date: Fri, 5 Jun 2020 16:31:03 -0700 [thread overview]
Message-ID: <20200605233103.57234-1-harshads@google.com> (raw)
Mkfs program can dump empty lines if encounters warnings and results
in test to fail. One of the case when this happens is when we are
trying to create a big file system (> 4T) and if "big" is not present
in /etc/mke2fs.conf. Ignore those empty lines too.
Before the fix, test generic/472 failed with following diff
diff /root/xfstests/tests/generic/472.out /root/xfstests/results//generic/472.out.bad
@@ -1,6 +1,6 @@
QA output created by 472
+
+
regular swap
too long swap
tiny swap
After the fix, test generic/472 passed
Ran generic/472
Passed all 1 tests
Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
---
common/rc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index 66c7fd4d..24f7fed3 100644
--- a/common/rc
+++ b/common/rc
@@ -560,7 +560,7 @@ _setup_large_ext4_fs()
_scratch_mkfs_ext4()
{
local mkfs_cmd="$MKFS_EXT4_PROG -F"
- local mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \""
+ local mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \" | grep -v \"^$\""
local tmp=`mktemp -u`
local mkfs_status
--
2.27.0.278.ge193c7cf3a9-goog
reply other threads:[~2020-06-05 23:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200605233103.57234-1-harshads@google.com \
--to=harshadshirwadkar@gmail.com \
--cc=fstests@vger.kernel.org \
--cc=harshads@google.com \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).