common: add _require_block_device() helper

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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/rc b/common/rc
index 6b2c6384a905cc71852e882661a704c69277f93b..961e0b8485f18bfefdb01da62cbc94dcf049ef6e 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -1247,10 +1247,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 02af7621903a04e0aba9e55a5e4a891e730de2f7..aa0aae0267c6999eda5c405b62197f235aa850a9 100755 (executable)
--- 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"