From a94334afa2ffdb104eec081a34e5d31922223b3d Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 29 Feb 2016 10:18:32 +1100 Subject: [PATCH] common: filter warning messages from mkfs.ext4 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 Reviewed-by: Christoph Hellwig Signed-off-by: Dave Chinner --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index af16c815..16f5a43a 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.39.5