[PATCH] Fix checking multiple modules error in _have_modules()
From: Xiao Liang <hidden>
Date: 2019-03-13 06:36:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Xiao Liang <redacted> --- 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