From 8e1388f521963aca6c4116d3d325e86d3cb67a7b Mon Sep 17 00:00:00 2001 From: Harshad Shirwadkar Date: Fri, 5 Jun 2020 16:31:03 -0700 Subject: [PATCH] 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 Signed-off-by: Harshad Shirwadkar Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index a6967831..f17b19f2 100644 --- a/common/rc +++ b/common/rc @@ -571,7 +571,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.39.5