From: Eric Sandeen <sandeen@redhat.com>
To: fstests@vger.kernel.org, linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: [PATCH] fstests: fix _filter_transcation_commit_default
Date: Tue, 24 Mar 2015 17:02:03 -0500 [thread overview]
Message-ID: <5511DEDB.9040804@redhat.com> (raw)
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>
---
diff --git a/common/filter.btrfs b/common/filter.btrfs
index ea047c5..9bb6479 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
}
next reply other threads:[~2015-03-24 22:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 22:02 Eric Sandeen [this message]
2015-03-25 3:23 ` [PATCH] fstests: fix _filter_transcation_commit_default Eryu Guan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5511DEDB.9040804@redhat.com \
--to=sandeen@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).