| Message ID | 1414502171-10319-3-git-send-email-eguan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 28, 2014 at 09:16:09PM +0800, Eryu Guan wrote: > 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. Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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"
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(+)