From: Christoph Hellwig Date: Wed, 1 Jun 2022 06:48:31 +0000 (+0200) Subject: nvme: use _have_loop instead of _have_modules loop X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=397599ed16e1c05c2607b430b33b0385dc5b82b7;p=users%2Fsagi%2Fblktests.git nvme: use _have_loop instead of _have_modules loop Also check for the losetup existance. Signed-off-by: Christoph Hellwig Reviewed-by: Shin'ichiro Kawasaki Signed-off-by: Shin'ichiro Kawasaki --- diff --git a/tests/nvme/002 b/tests/nvme/002 index ca11c11..6c6ae5f 100755 --- a/tests/nvme/002 +++ b/tests/nvme/002 @@ -11,7 +11,7 @@ DESCRIPTION="create many subsystems and test discovery" requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_loop } diff --git a/tests/nvme/003 b/tests/nvme/003 index 1364902..6604012 100755 --- a/tests/nvme/003 +++ b/tests/nvme/003 @@ -12,7 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics _have_writeable_kmsg } diff --git a/tests/nvme/004 b/tests/nvme/004 index 4b0b7ae..9dda538 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -13,7 +13,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/005 b/tests/nvme/005 index 9f3e388..de567a7 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -12,8 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop && \ - _have_module_param_value nvme_core multipath Y + _have_loop && _have_module_param_value nvme_core multipath Y _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/006 b/tests/nvme/006 index 9230dc6..d993861 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/008 b/tests/nvme/008 index 219fe9b..5568fe4 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/010 b/tests/nvme/010 index 08e39d5..b7b1d51 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -11,7 +11,7 @@ TIMED=1 requires() { _nvme_requires - _have_fio && _have_modules loop + _have_fio && _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/012 b/tests/nvme/012 index 6bb4972..c9d2438 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -14,7 +14,7 @@ requires() { _nvme_requires _have_xfs _have_fio - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/014 b/tests/nvme/014 index 48f8caa..d13cff7 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/015 b/tests/nvme/015 index e33cfde..bb52ba2 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/018 b/tests/nvme/018 index 7f407da..315e795 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -12,7 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/019 b/tests/nvme/019 index 8259e2e..4cb3509 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/021 b/tests/nvme/021 index fb77f9c..6ee0af1 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/022 b/tests/nvme/022 index 62c4690..1d76ffa 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/023 b/tests/nvme/023 index bce21b5..b65be07 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/024 b/tests/nvme/024 index ffec36c..f756797 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/025 b/tests/nvme/025 index 3d3f01b..941bf36 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/026 b/tests/nvme/026 index 2f56077..c3f06c2 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/027 b/tests/nvme/027 index 53f0664..0ad663a 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/028 b/tests/nvme/028 index 3d9084f..7de977a 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/029 b/tests/nvme/029 index 960e5f5..f8b4cbb 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -12,7 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/030 b/tests/nvme/030 index c6d485e..20fef69 100755 --- a/tests/nvme/030 +++ b/tests/nvme/030 @@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics } diff --git a/tests/nvme/031 b/tests/nvme/031 index 7c18a64..4e17982 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -19,7 +19,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }