diff mbox series

xfs/096: filter out the "Discarding..." output

Message ID 20200609082442.31982-1-zlang@redhat.com (mailing list archive)
State New, archived
Headers show
Series xfs/096: filter out the "Discarding..." output | expand

Commit Message

Zorro Lang June 9, 2020, 8:24 a.m. UTC
Latest xfsprogs mkfs.xfs prints "Discarding blocks...Done" if the
disk supports the trim. That breaks the golden image, cause
unexpected failure, so filter out it.

Signed-off-by: Zorro Lang <zlang@redhat.com>
---
 tests/xfs/096 | 1 +
 1 file changed, 1 insertion(+)

Comments

Darrick J. Wong June 9, 2020, 4:10 p.m. UTC | #1
On Tue, Jun 09, 2020 at 04:24:42PM +0800, Zorro Lang wrote:
> Latest xfsprogs mkfs.xfs prints "Discarding blocks...Done" if the
> disk supports the trim. That breaks the golden image, cause
> unexpected failure, so filter out it.
> 
> Signed-off-by: Zorro Lang <zlang@redhat.com>

Seems reasonable to me...
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  tests/xfs/096 | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/xfs/096 b/tests/xfs/096
> index ef6136af..04bc7b7d 100755
> --- a/tests/xfs/096
> +++ b/tests/xfs/096
> @@ -78,6 +78,7 @@ mkfs_filter()
>  	-e 's/ ftype=[01]//' \
>  	-e '/^log stripe unit.*too large/d' \
>  	-e '/^log stripe unit adjusted/d' \
> +	-e '/Discarding/d' \
>     | grep -v parent
>  }
>  
> -- 
> 2.20.1
>
diff mbox series

Patch

diff --git a/tests/xfs/096 b/tests/xfs/096
index ef6136af..04bc7b7d 100755
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -78,6 +78,7 @@  mkfs_filter()
 	-e 's/ ftype=[01]//' \
 	-e '/^log stripe unit.*too large/d' \
 	-e '/^log stripe unit adjusted/d' \
+	-e '/Discarding/d' \
    | grep -v parent
 }