| Message ID | 1456115171-13191-5-git-send-email-tytso@mit.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Looks fine,
Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/rc b/common/rc index f07b274..5fb3282 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
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 <tytso@mit.edu> --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)