From f6da66ec96fe6804989c459d43258ab0d6a7c2db Mon Sep 17 00:00:00 2001
From: Zorro Lang <zlang@redhat.com>
Date: Tue, 9 Jun 2020 16:24:42 +0800
Subject: [PATCH] xfs/096: filter out the "Discarding..." output

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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---
 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
 }