fstests: require scratch dev in tests using dm targets

We build dm device on top of scratch dev so we require $SCRATCH_DEV
to be a valid block device in _require_dm_target(). And we need to
_require_scratch before _require_dm_target, otherwise test fails if
there's no SCRATCH_DEV defined, where it should _notrun.

  +Usage: _require_block_device <dev>

So add _require_scratch_nocheck to generic/347 (we do the fs check
on thinp device), move _require_scratch before _require_dm_target in
xfs/006 and xfs/264.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eryu Guan
2016-09-22 16:52:36 +08:00
parent e35b2df320
commit a68323584d
3 changed files with 3 additions and 2 deletions
+1
View File
@@ -70,6 +70,7 @@ _workout()
_supported_fs generic _supported_fs generic
_supported_os Linux _supported_os Linux
_require_scratch_nocheck
_require_dm_target thin-pool _require_dm_target thin-pool
_setup_thin _setup_thin
+1 -1
View File
@@ -49,8 +49,8 @@ rm -f $seqres.full
# real QA test starts here # real QA test starts here
_supported_fs xfs _supported_fs xfs
_supported_os Linux _supported_os Linux
_require_dm_target error
_require_scratch _require_scratch
_require_dm_target error
_require_fs_sysfs error/fail_at_unmount _require_fs_sysfs error/fail_at_unmount
_scratch_mkfs > $seqres.full 2>&1 _scratch_mkfs > $seqres.full 2>&1
+1 -1
View File
@@ -49,8 +49,8 @@ rm -f $seqres.full
# real QA test starts here # real QA test starts here
_supported_fs xfs _supported_fs xfs
_supported_os Linux _supported_os Linux
_require_dm_target error
_require_scratch _require_scratch
_require_dm_target error
_require_fs_sysfs error/fail_at_unmount _require_fs_sysfs error/fail_at_unmount
_require_fs_sysfs error/metadata/EIO/max_retries _require_fs_sysfs error/metadata/EIO/max_retries
_require_fs_sysfs error/metadata/EIO/retry_timeout_seconds _require_fs_sysfs error/metadata/EIO/retry_timeout_seconds