xfs/096: filter out the "Discarding..." output
authorZorro Lang <zlang@redhat.com>
Tue, 9 Jun 2020 08:24:42 +0000 (16:24 +0800)
committerEryu Guan <guaneryu@gmail.com>
Sun, 21 Jun 2020 14:21:30 +0000 (22:21 +0800)
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

index ef6136afcba9317eed06d8f769c47be8276c09cf..04bc7b7dfdaae91e1ca97552555ceddc1eb12e7d 100755 (executable)
@@ -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
 }