From: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
To: linux-block@vger.kernel.org
Cc: linux-nvme@lists.infradead.org, Daniel Wagner <dwagern@suse.de>,
Chaitanya Kulkarni <kch@nvidia.com>,
Sagi Grimberg <sagi@grimberg.me>
Subject: [PATCH blktests v3 12/15] nvme/{021,022,025,026,027,028}: do not hard code target blkdev type
Date: Wed, 24 Apr 2024 16:59:52 +0900 [thread overview]
Message-ID: <20240424075955.3604997-13-shinichiro.kawasaki@wdc.com> (raw)
In-Reply-To: <20240424075955.3604997-1-shinichiro.kawasaki@wdc.com>
From: Daniel Wagner <dwagner@suse.de>
There is no need to hardcode the target blkdev type. This allows
the user to select different blkdev types via the nvmet_blkdev_type
environment variable. Also modify set_conditions() hooks to call
_set_nvme_trtype_and_nvmet_blkdev_type() instead of _set_nvme_trtype(),
so that the test cases are run for all blkdev types set in
NVMET_BLKDEV_TYPES.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
[Shin'ichiro: modify set_conditions()]
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Acked-by: Nitesh Shetty <nj.shetty@samsung.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---
tests/nvme/021 | 8 ++++----
tests/nvme/022 | 8 ++++----
tests/nvme/025 | 8 ++++----
tests/nvme/026 | 8 ++++----
tests/nvme/027 | 8 ++++----
tests/nvme/028 | 8 ++++----
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/tests/nvme/021 b/tests/nvme/021
index 270d90e..d7add6f 100755
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017-2018 Western Digital Corporation or its affiliates.
#
-# Test NVMe list command on NVMeOF with a file-backed ns.
+# Test NVMe list command.
. tests/nvme/rc
-DESCRIPTION="test NVMe list command on NVMeOF file-backed ns"
+DESCRIPTION="test NVMe list command"
QUICK=1
requires() {
@@ -16,7 +16,7 @@ requires() {
}
set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}
test() {
@@ -26,7 +26,7 @@ test() {
local ns
- _nvmet_target_setup --blkdev file
+ _nvmet_target_setup
_nvme_connect_subsys
diff --git a/tests/nvme/022 b/tests/nvme/022
index adaa765..0f2868c 100755
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017-2018 Western Digital Corporation or its affiliates.
#
-# Test NVMe reset command on NVMeOF with a file-backed ns.
+# Test NVMe reset command.
. tests/nvme/rc
-DESCRIPTION="test NVMe reset command on NVMeOF file-backed ns"
+DESCRIPTION="test NVMe reset command"
QUICK=1
requires() {
@@ -16,7 +16,7 @@ requires() {
}
set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}
test() {
@@ -26,7 +26,7 @@ test() {
local nvmedev
- _nvmet_target_setup --blkdev file
+ _nvmet_target_setup
_nvme_connect_subsys
diff --git a/tests/nvme/025 b/tests/nvme/025
index 224492b..a171099 100755
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017-2018 Western Digital Corporation or its affiliates.
#
-# Test NVMe effects-log command on NVMeOF with a file-backed ns.
+# Test NVMe effects-log command.
. tests/nvme/rc
-DESCRIPTION="test NVMe effects-log command on NVMeOF file-backed ns"
+DESCRIPTION="test NVMe effects-log"
QUICK=1
requires() {
@@ -16,7 +16,7 @@ requires() {
}
set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}
test() {
@@ -26,7 +26,7 @@ test() {
local ns
- _nvmet_target_setup --blkdev file
+ _nvmet_target_setup
_nvme_connect_subsys
diff --git a/tests/nvme/026 b/tests/nvme/026
index 6ee6a51..7196c60 100755
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017-2018 Western Digital Corporation or its affiliates.
#
-# Test NVMe ns-descs command on NVMeOF with a file-backed ns.
+# Test NVMe ns-descs command.
. tests/nvme/rc
-DESCRIPTION="test NVMe ns-descs command on NVMeOF file-backed ns"
+DESCRIPTION="test NVMe ns-descs"
QUICK=1
requires() {
@@ -16,7 +16,7 @@ requires() {
}
set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}
test() {
@@ -26,7 +26,7 @@ test() {
local ns
- _nvmet_target_setup --blkdev file
+ _nvmet_target_setup
_nvme_connect_subsys
diff --git a/tests/nvme/027 b/tests/nvme/027
index a63e42b..b117cc1 100755
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017-2018 Western Digital Corporation or its affiliates.
#
-# Test NVMe ns-rescan command on NVMeOF with a file-backed ns.
+# Test NVMe ns-rescan command.
. tests/nvme/rc
-DESCRIPTION="test NVMe ns-rescan command on NVMeOF file-backed ns"
+DESCRIPTION="test NVMe ns-rescan command"
QUICK=1
requires() {
@@ -16,7 +16,7 @@ requires() {
}
set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}
test() {
@@ -26,7 +26,7 @@ test() {
local nvmedev
- _nvmet_target_setup --blkdev file
+ _nvmet_target_setup
_nvme_connect_subsys
diff --git a/tests/nvme/028 b/tests/nvme/028
index 65c52a9..d6ffdd6 100755
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017-2018 Western Digital Corporation or its affiliates.
#
-# Test NVMe list-subsys command on NVMeOF with a file-backed ns.
+# Test NVMe list-subsys command.
. tests/nvme/rc
-DESCRIPTION="test NVMe list-subsys command on NVMeOF file-backed ns"
+DESCRIPTION="test NVMe list-subsys"
QUICK=1
requires() {
@@ -16,7 +16,7 @@ requires() {
}
set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}
test() {
@@ -24,7 +24,7 @@ test() {
_setup_nvmet
- _nvmet_target_setup --blkdev file
+ _nvmet_target_setup
_nvme_connect_subsys
--
2.44.0
next prev parent reply other threads:[~2024-04-24 8:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 7:59 [PATCH blktests v3 00/15] support test case repeat by different conditions Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 01/15] check: factor out _run_test() Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 02/15] check: support test case repeat by different conditions Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 03/15] check: use set_conditions() for the CAN_BE_ZONED test cases Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 04/15] meta/{016,017}: add test cases to check repeated test case runs Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 05/15] common/rc: introduce _check_conflict_and_set_default() Shin'ichiro Kawasaki
2024-04-24 12:27 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 06/15] nvme/rc: introduce NVMET_TRTYPES Shin'ichiro Kawasaki
2024-04-24 12:28 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 07/15] nvme/rc: add blkdev type environment variable Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 08/15] nvme/rc: introduce NVMET_BLKDEV_TYPES Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 09/15] nvme/{002-031,033-038,040-045,047,048}: support NMVET_TRTYPES Shin'ichiro Kawasaki
2024-04-24 7:59 ` [PATCH blktests v3 10/15] nvme/{006,008,010,012,014,019,023}: support NVMET_BLKDEV_TYPES Shin'ichiro Kawasaki
2024-04-28 8:58 ` Sagi Grimberg
2024-04-28 10:32 ` Shinichiro Kawasaki
2024-04-28 13:12 ` Sagi Grimberg
2024-04-28 23:58 ` Shinichiro Kawasaki
2024-04-30 12:00 ` Sagi Grimberg
2024-05-03 6:23 ` Shinichiro Kawasaki
2024-05-03 7:33 ` Sagi Grimberg
2024-04-24 7:59 ` [PATCH blktests v3 11/15] nvme/{007,009,011,013,015,020,024}: drop duplicate nvmet blkdev type tests Shin'ichiro Kawasaki
2024-04-24 7:59 ` Shin'ichiro Kawasaki [this message]
2024-04-24 7:59 ` [PATCH blktests v3 13/15] nvme/{rc,010,017,031,034,035}: rename nvme_img_size to NVME_IMG_SIZE Shin'ichiro Kawasaki
2024-04-24 12:29 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 14/15] nvme/{rc,016,017}: rename nvme_num_iter to NVME_NUM_ITER Shin'ichiro Kawasaki
2024-04-24 12:30 ` Daniel Wagner
2024-04-24 7:59 ` [PATCH blktests v3 15/15] nvme/rc,srp/rc,common/multipath-over-rdma: rename use_rxe to USE_RXE Shin'ichiro Kawasaki
2024-04-24 12:33 ` Daniel Wagner
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=20240424075955.3604997-13-shinichiro.kawasaki@wdc.com \
--to=shinichiro.kawasaki@wdc.com \
--cc=dwagern@suse.de \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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;
as well as URLs for NNTP newsgroup(s).