* [PATCH] ext4: add empty lines to mkfs_filter
@ 2020-06-05 23:31 Harshad Shirwadkar
0 siblings, 0 replies; only message in thread
From: Harshad Shirwadkar @ 2020-06-05 23:31 UTC (permalink / raw)
To: fstests; +Cc: tytso, Harshad Shirwadkar, Harshad Shirwadkar
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-05 23:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-05 23:31 [PATCH] ext4: add empty lines to mkfs_filter Harshad Shirwadkar
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).