From: Filipe David Borba Manana <fdmanana@gmail.com>
To: fstests@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org,
Filipe David Borba Manana <fdmanana@gmail.com>
Subject: [PATCH 1/2] xfstests: add helper require function _require_btrfs_cloner
Date: Fri, 23 May 2014 05:05:30 +0100 [thread overview]
Message-ID: <1400817931-32326-1-git-send-email-fdmanana@gmail.com> (raw)
So that the same check (btrfs cloner program presence) can be reused
by other tests.
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
common/rc | 7 +++++++
tests/btrfs/035 | 4 +---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/common/rc b/common/rc
index d1788d1..f27ee53 100644
--- a/common/rc
+++ b/common/rc
@@ -2085,6 +2085,13 @@ _require_fssum()
[ -x $FSSUM_PROG ] || _notrun "fssum not built"
}
+_require_btrfs_cloner()
+{
+ CLONER_PROG=$here/src/cloner
+ [ -x $CLONER_PROG ] || \
+ _notrun "cloner binary not present at $CLONER_PROG"
+}
+
# Given 2 files, verify that they have the same mapping but different
# inodes - i.e. an undisturbed reflink
# Silent if so, make noise if not
diff --git a/tests/btrfs/035 b/tests/btrfs/035
index 6808179..dd303af 100755
--- a/tests/btrfs/035
+++ b/tests/btrfs/035
@@ -45,13 +45,11 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
_supported_fs btrfs
_supported_os Linux
_require_scratch
+_require_btrfs_cloner
_scratch_mkfs > /dev/null 2>&1
_scratch_mount
-CLONER_PROG=$here/src/cloner
-[ -x $CLONER_PROG ] || _notrun "cloner binary not present at $CLONER_PROG"
-
src_str="aaaaaaaaaa"
echo -n "$src_str" > $SCRATCH_MNT/src
--
1.9.1
next reply other threads:[~2014-05-23 3:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-23 4:05 Filipe David Borba Manana [this message]
2014-05-23 4:05 ` [PATCH 2/2] xfstests: add test for btrfs ioctl clone operation Filipe David Borba Manana
2014-05-23 9:44 ` David Disseldorp
2014-05-23 13:19 ` [PATCH 2/2 v2] " Filipe David Borba Manana
2014-05-24 16:50 ` [PATCH 2/2 v3] " Filipe David Borba Manana
2014-05-26 15:48 ` David Disseldorp
2014-05-23 9:39 ` [PATCH 1/2] xfstests: add helper require function _require_btrfs_cloner David Disseldorp
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=1400817931-32326-1-git-send-email-fdmanana@gmail.com \
--to=fdmanana@gmail.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).