nvme/{006,008,010,012,014,019,023}: support NVMET_BLKDEV_TYPES

Enable repeated test runs for the listed test cases for
NVMET_BLKDEV_TYPES. 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.

The test cases already support the repetition for NVMET_TRTYPES. Modify
the set_conditions() hooks to call both NVMET_BLKDEV_TYPES and
NVMET_TRTYPES using _set_combined_conditions(). When NVMET_BLKDEV_TYPES
and NVMET_TRTYPES are set as follows, the test cases are repeated
2 x 3 = 6 times each.

      NVMET_BLKDEV_TYPES="device file"
      NVMET_TRTYPES="loop rdma tcp"

Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/006 b/tests/nvme/006
index ff0a9eb9fdedb0ad4df156fe5c2df9991ed0a9d8..3f9d209deeca2386915ed25d86e4869452257635 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -16,7 +16,7 @@ requires() {
 }
 
 set_conditions() {
-       _set_nvme_trtype "$@"
+       _set_combined_conditions _set_nvme_trtype _set_nvmet_blkdev_type "$@"
 }
 
 test() {

diff --git a/tests/nvme/008 b/tests/nvme/008
index 1877d8a7f45a10405f5f7dfa2ed2011997b1512a..247850c2609e44ef1b64c48e014d74d5ebb99d8e 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -16,7 +16,7 @@ requires() {
 }
 
 set_conditions() {
-       _set_nvme_trtype "$@"
+       _set_combined_conditions _set_nvme_trtype _set_nvmet_blkdev_type "$@"
 }
 
 test() {

diff --git a/tests/nvme/010 b/tests/nvme/010
index 34914a7b5e2aee1398e58b66a65238bdb314bf4c..c16587fc121d08eb4bed51edae3b1d8326a30c72 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -16,7 +16,7 @@ requires() {
 }
 
 set_conditions() {
-       _set_nvme_trtype "$@"
+       _set_combined_conditions _set_nvme_trtype _set_nvmet_blkdev_type "$@"
 }
 
 test() {

diff --git a/tests/nvme/012 b/tests/nvme/012
index e06bf8d59015ae71d38f548fabb83a1dff9d13b9..e6674e26bd8871aa8ee1c937696d26319a9c30c5 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -20,7 +20,7 @@ requires() {
 }
 
 set_conditions() {
-       _set_nvme_trtype "$@"
+       _set_combined_conditions _set_nvme_trtype _set_nvmet_blkdev_type "$@"
 }
 
 test() {

diff --git a/tests/nvme/014 b/tests/nvme/014
index ff0ebfbf565c9249e4c3d966c54161b6ccb6acf6..571c6f47b29385342f979e629660e659a887168d 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -16,7 +16,7 @@ requires() {
 }
 
 set_conditions() {
-       _set_nvme_trtype "$@"
+       _set_combined_conditions _set_nvme_trtype _set_nvmet_blkdev_type "$@"
 }
 
 test() {

diff --git a/tests/nvme/019 b/tests/nvme/019
index 31020d90e7fd41e814dfeaff7ca71bb061f40890..501256c21f45c0b0c536d911ef1a95d677b79edf 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -16,7 +16,7 @@ requires() {
 }
 
 set_conditions() {
-       _set_nvme_trtype "$@"
+       _set_combined_conditions _set_nvme_trtype _set_nvmet_blkdev_type "$@"
 }
 
 test() {

diff --git a/tests/nvme/023 b/tests/nvme/023
index da99406f3fc79492215423ced5ab66209d3f0364..3c43c55e7e6d59af0d2f27b581aef32417ca20a4 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -16,7 +16,7 @@ requires() {
 }
 
 set_conditions() {
-       _set_nvme_trtype "$@"
+       _set_combined_conditions _set_nvme_trtype _set_nvmet_blkdev_type "$@"
 }
 
 test() {