[PATCH blktests v2 09/11] nvme/{006,008,010,012,014,019,023}: support NVMET_BLKDEV_TYPES

Shin'ichiro Kawasaki
2024-04-16T10:32:17Z

Enable repeated test runs for the listed test cases for
NVMET_BLKDEV_TYPES. Modify the set_conditions() hooks to call
_set_nvme_trtype_and_nvmet_blkdev_type() instead of _set_nvmet_trtype()
so that the test cases are repeated for listed conditions in
NVMET_BLKDEV_TYPES and NVMET_TRTYPES.

The default values of NVMET_BLKDEV_TYPES is (device file). With this
default set up, each of the listed test cases are run twice. The second
runs of the test cases for 'file' blkdev type do exact same test as
other test cases nvme/007, 009, 011, 013, 015, 020 and 024.

Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---
tests/nvme/006 | 2 +-
tests/nvme/008 | 2 +-
tests/nvme/010 | 2 +-
tests/nvme/012 | 2 +-
tests/nvme/014 | 2 +-
tests/nvme/019 | 2 +-
tests/nvme/023 | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/nvme/006 b/tests/nvme/006
index a0c4096..0e1f142 100755
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -16,7 +16,7 @@ requires() {
}

set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}

test() {
diff --git a/tests/nvme/008 b/tests/nvme/008
index 1877d8a..b53ecdb 100755
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -16,7 +16,7 @@ requires() {
}

set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}

test() {
diff --git a/tests/nvme/010 b/tests/nvme/010
index 34914a7..0417daf 100755
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -16,7 +16,7 @@ requires() {
}

set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}

test() {
diff --git a/tests/nvme/012 b/tests/nvme/012
index e06bf8d..37b9056 100755
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -20,7 +20,7 @@ requires() {
}

set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}

test() {
diff --git a/tests/nvme/014 b/tests/nvme/014
index ff0ebfb..bcfbc87 100755
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -16,7 +16,7 @@ requires() {
}

set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}

test() {
diff --git a/tests/nvme/019 b/tests/nvme/019
index 31020d9..fb11d41 100755
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -16,7 +16,7 @@ requires() {
}

set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}

test() {
diff --git a/tests/nvme/023 b/tests/nvme/023
index da99406..a723b73 100755
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -16,7 +16,7 @@ requires() {
}

set_conditions() {
- _set_nvme_trtype "$@"
+ _set_nvme_trtype_and_nvmet_blkdev_type "$@"
}

test() {
--
2.44.0