From: Eryu Guan <eguan@redhat.com>
To: fstests@vger.kernel.org
Cc: linux-nfs@vger.kernel.org, Eryu Guan <eguan@redhat.com>
Subject: [PATCH 2/4] common: add _require_block_device() helper
Date: Tue, 28 Oct 2014 21:16:09 +0800 [thread overview]
Message-ID: <1414502171-10319-3-git-send-email-eguan@redhat.com> (raw)
In-Reply-To: <1414502171-10319-1-git-send-email-eguan@redhat.com>
Add _require_block_device() helper and use it in _require_dm_flakey()
and generic/076.
_require_dm_flakey() assumes $SCRATCH_DEV is a block device, now it can
also be a NFS export.
generic/076 does "cat $SCRATCH_DEV" which will fail when testing on NFS.
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
common/rc | 15 +++++++++++++++
tests/generic/076 | 1 +
2 files changed, 16 insertions(+)
diff --git a/common/rc b/common/rc
index 8738da7..42f00cb 100644
--- a/common/rc
+++ b/common/rc
@@ -1237,10 +1237,25 @@ _require_command()
[ -n "$1" -a -x "$1" ] || _notrun "$_cmd utility required, skipped this test"
}
+# this test requires the device to be valid block device
+# $1 - device
+_require_block_device()
+{
+ if [ -z "$1" ]; then
+ echo "Usage: _require_block_device <dev>" 1>&2
+ exit 1
+ fi
+ if [ "`_is_block_dev $SCRATCH_DEV`" == "" ]; then
+ _notrun "require $1 to be valid block disk"
+ fi
+}
+
# this test requires the device mapper flakey target
#
_require_dm_flakey()
{
+ # require SCRATCH_DEV to be a valid block device
+ _require_block_device $SCRATCH_DEV
_require_command $DMSETUP_PROG
modprobe dm-flakey >/dev/null 2>&1
diff --git a/tests/generic/076 b/tests/generic/076
index 02af762..aa0aae0 100755
--- a/tests/generic/076
+++ b/tests/generic/076
@@ -56,6 +56,7 @@ _supported_fs generic
_supported_os IRIX Linux
_require_scratch
+_require_block_device $SCRATCH_DEV
echo "*** init fs"
--
1.8.3.1
next prev parent reply other threads:[~2014-10-28 13:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 13:16 [RFC PATCH 0/4] re-enable tests that require scratch dev on NFS Eryu Guan
2014-10-28 13:16 ` [PATCH 1/4] common: " Eryu Guan
2014-10-28 13:22 ` Christoph Hellwig
2014-10-29 6:59 ` Eryu Guan
2014-10-28 13:16 ` Eryu Guan [this message]
2014-10-28 13:24 ` [PATCH 2/4] common: add _require_block_device() helper Christoph Hellwig
2014-10-28 13:16 ` [PATCH 3/4] common: skip atime related tests on NFS Eryu Guan
2014-10-30 9:03 ` nfs atime semantics, was: " Christoph Hellwig
2014-10-31 8:13 ` Eryu Guan
2014-10-31 11:31 ` Trond Myklebust
2014-11-02 18:02 ` Boaz Harrosh
2014-11-05 8:29 ` Christoph Hellwig
2014-10-28 13:16 ` [PATCH 4/4] generic/277: add _require_attrs Eryu Guan
2014-10-28 13:23 ` Christoph Hellwig
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=1414502171-10319-3-git-send-email-eguan@redhat.com \
--to=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-nfs@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.