public inbox for linux-block@vger.kernel.org
 help / color / mirror / Atom feed
From: Xiao Liang <xiliang@redhat.com>
To: linux-block@vger.kernel.org, osandov@fb.com
Cc: xiliang@redhat.com
Subject: [PATCH blktests] Fix checking multiple modules error in _have_modules()
Date: Wed, 13 Mar 2019 14:41:05 +0800	[thread overview]
Message-ID: <20190313064105.7751-1-xiliang@redhat.com> (raw)

Signed-off-by: Xiao Liang <xiliang@redhat.com>
---
 common/rc      | 2 +-
 tests/nvme/002 | 2 +-
 tests/nvme/003 | 2 +-
 tests/nvme/004 | 2 +-
 tests/nvme/015 | 2 +-
 tests/nvme/018 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/rc b/common/rc
index 0c354a2..282d137 100644
--- a/common/rc
+++ b/common/rc
@@ -33,7 +33,7 @@ _have_modules() {
 	local module
 
 	for module in "$@"; do
-		if ! modprobe -n -q "$1"; then
+		if ! modprobe -n -q $module; then
 			missing+=("$module")
 		fi
 	done
diff --git a/tests/nvme/002 b/tests/nvme/002
index 0132ac0..106a5a8 100755
--- a/tests/nvme/002
+++ b/tests/nvme/002
@@ -10,7 +10,7 @@
 DESCRIPTION="create many subsystems and test discovery"
 
 requires() {
-	_have_program nvme && _have_modules loop nvme-loop && _have_configfs
+	_have_program nvme && _have_modules loop nvme-loop nvmet && _have_configfs
 }
 
 test() {
diff --git a/tests/nvme/003 b/tests/nvme/003
index f304071..c6b3d40 100755
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -11,7 +11,7 @@ DESCRIPTION="test if we're sending keep-alives to a discovery controller"
 QUICK=1
 
 requires() {
-	_have_program nvme && _have_modules loop nvme-loop && _have_configfs
+	_have_program nvme && _have_modules loop nvme-loop nvmet && _have_configfs
 }
 
 test() {
diff --git a/tests/nvme/004 b/tests/nvme/004
index 346f309..0506fa2 100755
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -12,7 +12,7 @@ DESCRIPTION="test nvme and nvmet UUID NS descriptors"
 QUICK=1
 
 requires() {
-	_have_program nvme && _have_modules loop nvme-loop && _have_configfs
+	_have_program nvme && _have_modules loop nvme-loop nvmet && _have_configfs
 }
 
 test() {
diff --git a/tests/nvme/015 b/tests/nvme/015
index 29cf954..47e1b04 100755
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -10,7 +10,7 @@ DESCRIPTION="unit test for NVMe flush for file backed ns"
 QUICK=1
 
 requires() {
-	_have_program nvme && _have_modules loop nvme-loop && _have_configfs
+	_have_program nvme && _have_modules loop nvme-loop nvmet && _have_configfs
 }
 
 test() {
diff --git a/tests/nvme/018 b/tests/nvme/018
index b09c29c..e29fa92 100755
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -11,7 +11,7 @@ DESCRIPTION="unit test NVMe-oF out of range access on a file backend"
 QUICK=1
 
 requires() {
-	_have_program nvme && _have_modules nvme-loop && _have_modules loop && \
+	_have_program nvme && _have_modules loop nvme-loop nvmet && \
 		_have_configfs
 }
 
-- 
2.17.2


             reply	other threads:[~2019-03-13  6:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-13  6:41 Xiao Liang [this message]
2019-03-13  6:50 ` [PATCH blktests] Fix checking multiple modules error in _have_modules() Omar Sandoval
  -- strict thread matches above, loose matches on Subject: below --
2019-03-13  7:05 Xiao Liang
2019-03-13  7:08 ` Omar Sandoval
2019-03-13 17:48 ` Chaitanya Kulkarni

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=20190313064105.7751-1-xiliang@redhat.com \
    --to=xiliang@redhat.com \
    --cc=linux-block@vger.kernel.org \
    --cc=osandov@fb.com \
    /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