[1/5] xfs/449: filter out "Discarding..." from output
diff mbox series

Message ID 158086090849.1989378.625300470019425718.stgit@magnolia
State Accepted
Headers show
Series
  • fstests: random fixes
Related show

Commit Message

Darrick J. Wong Feb. 5, 2020, 12:01 a.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

xfsprogs 5.4 prints "Discarding..." if the disk supports the trim
command.  Filter this out of the output because xfs_info and friends
won't print that out.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/449 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Zorro Lang Feb. 6, 2020, 4:44 a.m. UTC | #1
On Tue, Feb 04, 2020 at 04:01:48PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> xfsprogs 5.4 prints "Discarding..." if the disk supports the trim
> command.  Filter this out of the output because xfs_info and friends
> won't print that out.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tests/xfs/449 |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 
> diff --git a/tests/xfs/449 b/tests/xfs/449
> index 7aae1545..83c3c493 100755
> --- a/tests/xfs/449
> +++ b/tests/xfs/449
> @@ -39,7 +39,7 @@ _require_scratch_nocheck
>  _require_xfs_spaceman_command "info"
>  _require_command "$XFS_GROWFS_PROG" xfs_growfs
>  
> -_scratch_mkfs > $tmp.mkfs
> +_scratch_mkfs | sed -e '/Discarding/d' > $tmp.mkfs

Looks good to me.

>  echo MKFS >> $seqres.full
>  cat $tmp.mkfs >> $seqres.full
>  
>

Patch
diff mbox series

diff --git a/tests/xfs/449 b/tests/xfs/449
index 7aae1545..83c3c493 100755
--- a/tests/xfs/449
+++ b/tests/xfs/449
@@ -39,7 +39,7 @@  _require_scratch_nocheck
 _require_xfs_spaceman_command "info"
 _require_command "$XFS_GROWFS_PROG" xfs_growfs
 
-_scratch_mkfs > $tmp.mkfs
+_scratch_mkfs | sed -e '/Discarding/d' > $tmp.mkfs
 echo MKFS >> $seqres.full
 cat $tmp.mkfs >> $seqres.full