From: Eryu Guan <eguan@redhat.com>
To: fstests@vger.kernel.org
Cc: linux-nfs@vger.kernel.org, Eryu Guan <eguan@redhat.com>
Subject: [PATCH v2 2/5] common: add _require_block_device() helper
Date: Sat, 1 Nov 2014 01:03:57 +0800 [thread overview]
Message-ID: <1414775040-4051-3-git-send-email-eguan@redhat.com> (raw)
In-Reply-To: <1414775040-4051-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.
Reviewed-by: Christoph Hellwig <hch@lst.de>
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 ae03712..ca8c4a2 100644
--- a/common/rc
+++ b/common/rc
@@ -1243,10 +1243,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.9.3
next prev parent reply other threads:[~2014-10-31 17:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-31 17:03 [PATCH v2 0/5] re-enable tests that require scratch dev on NFS Eryu Guan
2014-10-31 17:03 ` [PATCH v2 1/5] common: " Eryu Guan
2014-11-10 2:12 ` Dave Chinner
2014-11-10 4:05 ` Eryu Guan
2014-11-12 18:36 ` Steve French
2014-11-12 18:36 ` Steve French
2014-11-13 3:33 ` Dave Chinner
2014-11-13 3:33 ` Dave Chinner
2014-11-14 17:02 ` Steve French
2014-11-14 17:02 ` Steve French
2014-11-15 5:35 ` Eryu Guan
2014-11-15 5:35 ` Eryu Guan
2014-11-17 5:41 ` Dave Chinner
2014-11-17 5:41 ` Dave Chinner
2014-11-17 6:06 ` Eryu Guan
2014-11-17 6:06 ` Eryu Guan
2014-11-17 6:54 ` Dave Chinner
2014-11-17 6:54 ` Dave Chinner
2014-11-17 14:53 ` Omer Zilberberg
2014-11-17 14:53 ` Omer Zilberberg
2014-11-17 20:22 ` Dave Chinner
2014-11-17 20:22 ` Dave Chinner
2014-11-18 16:16 ` Omer Zilberberg
2014-11-18 16:16 ` Omer Zilberberg
2014-11-17 5:34 ` Dave Chinner
2014-11-17 5:34 ` Dave Chinner
2014-10-31 17:03 ` Eryu Guan [this message]
2014-10-31 17:03 ` [PATCH v2 3/5] common: skip atime related tests " Eryu Guan
2014-10-31 17:03 ` [PATCH v2 4/5] common: use _scratch_mount helper in _require_relatime() Eryu Guan
2014-10-31 17:04 ` [PATCH v2 5/5] generic/277: add _require_attrs Eryu Guan
[not found] ` <1414775040-4051-1-git-send-email-eguan-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-11-02 20:52 ` Fwd: [PATCH v2 0/5] re-enable tests that require scratch dev on NFS Steve French
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=1414775040-4051-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.