| Message ID | 1474535153-15183-1-git-send-email-eguan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Sep 22, 2016 at 05:05:53PM +0800, Eryu Guan wrote: > 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. > > Signed-off-by: Eryu Guan <eguan@redhat.com> Looks good. Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff --git a/tests/generic/347 b/tests/generic/347 index 7e6b5e6..3adc674 100755 --- a/tests/generic/347 +++ b/tests/generic/347 @@ -70,6 +70,7 @@ _workout() _supported_fs generic _supported_os Linux +_require_scratch_nocheck _require_dm_target thin-pool _setup_thin diff --git a/tests/xfs/006 b/tests/xfs/006 index d8674f4..982a161 100755 --- a/tests/xfs/006 +++ b/tests/xfs/006 @@ -49,8 +49,8 @@ rm -f $seqres.full # real QA test starts here _supported_fs xfs _supported_os Linux -_require_dm_target error _require_scratch +_require_dm_target error _require_fs_sysfs error/fail_at_unmount _scratch_mkfs > $seqres.full 2>&1 diff --git a/tests/xfs/264 b/tests/xfs/264 index d3e920c..245b0ad 100755 --- a/tests/xfs/264 +++ b/tests/xfs/264 @@ -49,8 +49,8 @@ rm -f $seqres.full # real QA test starts here _supported_fs xfs _supported_os Linux -_require_dm_target error _require_scratch +_require_dm_target error _require_fs_sysfs error/fail_at_unmount _require_fs_sysfs error/metadata/EIO/max_retries _require_fs_sysfs error/metadata/EIO/retry_timeout_seconds
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. Signed-off-by: Eryu Guan <eguan@redhat.com> --- tests/generic/347 | 1 + tests/xfs/006 | 2 +- tests/xfs/264 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)