Skip to contentSkip to conversation

ext4: add empty lines to mkfs_filter

PATCH New Harshad Shirwadkar 1 participant 1 message Jun 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext4: add empty lines to mkfs_filter

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

---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/rc +1 -1
index 66c7fd4d..24f7fed3 100644
@@ -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
 
Signature · 1 line
2.27.0.278.ge193c7cf3a9-goog