From: Dave Chinner <dchinner@redhat.com>
Date: Thu, 14 May 2015 02:17:29 +0000 (+1000)
Subject: filter: latest mkfs.xfs makes logical sector size noise
X-Git-Tag: v2022.05.01~2888
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae3d21574ad04ea5ea858ea9dbaea130c14290a8;p=users%2Fhch%2Fxfstests-dev.git

filter: latest mkfs.xfs makes logical sector size noise

On devices that have a logical sector smaller than physical sector,
this extra, harmless output now occurs:

     QA output created by 060
    +specified blocksize 1024 is less than device physical sector size 4096
    +switching to logical sector size 512
     Creating directory system to dump using src/fill.
     Setup .......................................
     Dumping to files...

And it causes lots of tests to fail unnecessarily. Filter it.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/common/rc b/common/rc
index 6ea107e1e..242dedb04 100644
--- a/common/rc
+++ b/common/rc
@@ -365,9 +365,12 @@ _scratch_mkfs_xfs()
 		mkfs_status=$?
 	fi
 
-	# output stored mkfs output
-	cat $tmp_dir.mkfserr >&2
+	# output stored mkfs output, filtering unnecessary warnings from stderr
 	cat $tmp_dir.mkfsstd
+	cat $tmp_dir.mkfserr | sed \
+		-e '/less than device physical sector/d' \
+		-e '/switching to logical sector/d' \
+		>&2
 	rm -f $tmp_dir.mkfserr $tmp_dir.mkfsstd
 
 	return $mkfs_status