nvme/{rc,016,017}: rename nvme_num_iter to NVME_NUM_ITER

To follow uppercase letter guide of environment variables, rename
nvme_num_iter to NVME_NUM_ITER.

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

diff --git a/Documentation/running-tests.md b/Documentation/running-tests.md
index 736ab4823aed21ebdee912f5d19110ed3f1dd5e6..7bd0885a91bc7e96735dcc89683557b441adc626 100644 (file)
--- a/Documentation/running-tests.md
+++ b/Documentation/running-tests.md
@@ -117,8 +117,9 @@ The NVMe tests can be additionally parameterized via environment variables.
   Run the tests with given image size in bytes. 'm', 'M', 'g' and 'G' postfix
   are supported. This parameter had an old name 'nvme_img_size'. The old name
   is still usable, but not recommended.
-- nvme_num_iter: 1000 (default)
-  The number of iterations a test should do.
+- NVME_NUM_ITER: 1000 (default)
+  The number of iterations a test should do. This parameter had an old name
+  'nvme_num_iter'. The old name is still usable, but not recommended.
 
 ### Running nvme-rdma and SRP tests
 

diff --git a/tests/nvme/016 b/tests/nvme/016
index a65cffdd755a80e72f3810c81059507d02ea34e6..d1fdb351bd749cd93d9ce62b0c075125fdf91796 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -23,7 +23,7 @@ test() {
        _setup_nvmet
 
        local port
-       local iterations="${nvme_num_iter}"
+       local iterations="${NVME_NUM_ITER}"
        local loop_dev
 
        loop_dev="$(losetup -f)"

diff --git a/tests/nvme/017 b/tests/nvme/017
index 4f144710d544ec12c718e773f75951f4d9010a86..114be607b1cfad39cf9c98adcad124ab967d6d0d 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -23,7 +23,7 @@ test() {
        _setup_nvmet
 
        local port
-       local iterations="${nvme_num_iter}"
+       local iterations="${NVME_NUM_ITER}"
 
        truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path)"
 

diff --git a/tests/nvme/rc b/tests/nvme/rc
index ef7b9669e96065f0edf821b3c00fa1b9613d30f2..6fc002096d97893c7ba97e9e9c12584bfe2da499 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -20,7 +20,7 @@ export def_subsysnqn="blktests-subsystem-1"
 export def_subsys_uuid="91fdba0d-f87b-4c25-b80f-db7be1418b9e"
 _check_conflict_and_set_default NVMET_TRTYPES nvme_trtype "loop"
 _check_conflict_and_set_default NVME_IMG_SIZE nvme_img_size 1G
-nvme_num_iter=${nvme_num_iter:-"1000"}
+_check_conflict_and_set_default NVME_NUM_ITER nvme_num_iter 1000
 nvmet_blkdev_type=${nvmet_blkdev_type:-"device"}
 NVMET_BLKDEV_TYPES=${NVMET_BLKDEV_TYPES:-"device file"}