From: Eric Sandeen <sandeen@redhat.com>
Date: Wed, 1 Apr 2015 00:34:45 +0000 (+1100)
Subject: filter: btrfs-progs subvolume delete output changed
X-Git-Tag: v2022.05.01~2911
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=552dcfb47c9003bff2c809677f4db9da3453422b;p=users%2Fhch%2Fxfstests-dev.git

filter: btrfs-progs subvolume delete output changed

btrfs has started emitting new information from
cmd_subvol_delete(), so filter that out or it breaks btrfs/001:

    -Delete subvolume 'SCRATCH_MNT/snap'
    +Delete subvolume (no-commit): 'SCRATCH_MNT/snap'

(Spell "transaction" correctly while we're at it.)

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

diff --git a/common/filter.btrfs b/common/filter.btrfs
index ea047c55e..9bb64792f 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -57,13 +57,14 @@ _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
-_filter_transcation_commit_default() {
-	sed -e "/Transaction commit: none (default)/d"
+_filter_transaction_commit() {
+	sed -e "/Transaction commit: none (default)/d" | \
+	sed -e "s/Delete subvolume (.*commit):/Delete subvolume/g"
 }
 
 _filter_btrfs_subvol_delete()
 {
-	_filter_scratch | _filter_transcation_commit_default
+	_filter_scratch | _filter_transaction_commit
 
 }