public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Eryu Guan <eguan@redhat.com>
To: fstests@vger.kernel.org
Cc: Eryu Guan <eguan@redhat.com>
Subject: [PATCH] fstests: require scratch dev in tests using dm targets
Date: Thu, 22 Sep 2016 17:05:53 +0800	[thread overview]
Message-ID: <1474535153-15183-1-git-send-email-eguan@redhat.com> (raw)

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(-)

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
-- 
2.7.4


             reply	other threads:[~2016-09-22  9:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-22  9:05 Eryu Guan [this message]
2016-09-22 22:29 ` [PATCH] fstests: require scratch dev in tests using dm targets Dave Chinner

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=1474535153-15183-1-git-send-email-eguan@redhat.com \
    --to=eguan@redhat.com \
    --cc=fstests@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox