From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: wangshilong1991@gmail.com
Subject: [PATCH 1/2 v2] xfstests: make btrfs/001.out in line with subvol delete output
Date: Tue, 14 Jan 2014 11:23:48 +0800 [thread overview]
Message-ID: <1389669828-2222-1-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1389618990-24544-1-git-send-email-anand.jain@oracle.com>
From: Anand Jain <Anand.Jain@oracle.com>
btrfs/001 is failing as the below btrfs-progs patch changed the
output during subvol delete.
Patch :
btrfs-progs: add options to set commit mode after subvol delete
adding it to the filter
Signed-off-by: Anand Jain <Anand.Jain@oracle.com>
---
v2: accepts Wang suggested
common/filter | 4 ++++
common/filter.btrfs | 6 ++++++
tests/btrfs/001 | 3 ++-
3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/common/filter b/common/filter
index c872a27..3842c1b 100644
--- a/common/filter
+++ b/common/filter
@@ -313,5 +313,9 @@ _filter_ro_mount() {
-e "s/mount: cannot mount block device/mount: cannot mount/g"
}
+_filter_transcation_commit_default() {
+ sed -e "/Transaction commit: none (default)/d"
+}
+
# make sure this script returns success
/bin/true
diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..563dff4 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -56,5 +56,11 @@ _filter_btrfs_device_stats()
sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
}
+_filter_btrfs_subvol_delete()
+{
+ _filter_scratch | _filter_transcation_commit_default
+
+}
+
# make sure this script returns success
/bin/true
diff --git a/tests/btrfs/001 b/tests/btrfs/001
index c05d772..8258d06 100755
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -40,6 +40,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
+. ./common/filter.btrfs
# real QA test starts here
_supported_fs btrfs
@@ -98,7 +99,7 @@ echo "Listing subvolumes"
$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | awk '{ print $NF }'
# Delete the snapshot
-$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_scratch
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete
echo "List root dir"
ls $SCRATCH_MNT
_scratch_remount
--
1.7.1
next prev parent reply other threads:[~2014-01-14 3:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 13:16 [PATCH 1/2] xfstests: make btrfs/001.out in line with subvol delete output Anand Jain
2014-01-13 13:14 ` Wang Shilong
2014-01-13 13:27 ` Anand Jain
2014-01-13 13:16 ` [PATCH 2/2] xfstest: tests btrfs/006 fails with mixed-mode/small disks Anand Jain
2014-01-14 3:23 ` Anand Jain [this message]
2014-01-15 14:19 ` [PATCH 1/2 v2] xfstests: make btrfs/001.out in line with subvol delete output David Sterba
2014-01-16 3:04 ` [PATCH 1/2 v3] " Anand Jain
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=1389669828-2222-1-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wangshilong1991@gmail.com \
/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