nvme: Use def_file_path variable instead local variable

As all tests are using the same file path name anyway, use
the def_file_path variable.

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

diff --git a/tests/nvme/004 b/tests/nvme/004
index 0314ed3c949e361cceddd3caba1592800160ce0e..78b11c7b84c5fe43cd5e5b05799f96d47cc34b31 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -27,9 +27,9 @@ test() {
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
-       truncate -s "${nvme_img_size}" "$TMPDIR/img"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "$TMPDIR/img")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -47,7 +47,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
        losetup -d "$loop_dev"
-       rm "$TMPDIR/img"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/005 b/tests/nvme/005
index 935b8634cb96a0228b9d4cf46fb87ccdc53618c0..211b8affc32a023116877c403259b01f03abb5ac 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -27,9 +27,9 @@ test() {
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
-       truncate -s "${nvme_img_size}" "$TMPDIR/img"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "$TMPDIR/img")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -49,7 +49,7 @@ test() {
 
        _remove_nvmet_subsystem "${def_subsysnqn}"
        losetup -d "$loop_dev"
-       rm "$TMPDIR/img"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/006 b/tests/nvme/006
index 066acabb11750d49ebc94acfbf0287dbfcaaed38..f31633825a70b0474f0bd193da2633acc724bcfd 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -23,9 +23,9 @@ test() {
        local port
        local loop_dev
 
-       truncate -s "${nvme_img_size}" "$TMPDIR/img"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "$TMPDIR/img")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -38,7 +38,7 @@ test() {
 
        losetup -d "$loop_dev"
 
-       rm "$TMPDIR/img"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/007 b/tests/nvme/007
index c6ba36cc4b4f5d3f72846f66eb15b6a3dfdb7a59..b6a4bc437103c8f1ba41fe58f81d3f792bc6c64a 100755 (executable)
--- a/tests/nvme/007
+++ b/tests/nvme/007
@@ -20,13 +20,10 @@ test() {
        _setup_nvmet
 
        local port
-       local file_path
 
-       file_path="${TMPDIR}/img"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
-
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -35,7 +32,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/008 b/tests/nvme/008
index c3fbcbc596867c46f8c83d109751d4bae6c2ecdf..a38926ef0051b819319093573cdcb1bae5624993 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -23,11 +23,10 @@ test() {
        local port
        local nvmedev
        local loop_dev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -50,7 +49,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/009 b/tests/nvme/009
index 88c27889fbe17ee31fbfdb055dcef3b119035ea3..2c8ea7ead9b84a40485453a6cff8e3d3f214125b 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -21,11 +21,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -44,7 +43,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/010 b/tests/nvme/010
index 38c062ec73f4104aeb390899f55497e41f1584df..81f7d2024ee6f41f19bc418398294bc357483cb3 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -23,11 +23,10 @@ test() {
        local port
        local nvmedev
        local loop_dev
-       local file_path="${TMPDIR}/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -51,7 +50,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/011 b/tests/nvme/011
index 0dab74e7e5b56ba1c56aa96a02c50ccd48c84f43..e6f78867e283dfbfa72cd3a0904b8b2d35fc2db0 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -22,12 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path
-       local file_path="${TMPDIR}/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -47,7 +45,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/012 b/tests/nvme/012
index 8ed57d3a5ab0974a6b26b0fdda3b9bafdb8d8647..85549c25a1c609846d3acb62aceec12027cd1719 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -27,11 +27,10 @@ test() {
        local port
        local nvmedev
        local loop_dev
-       local file_path="${TMPDIR}/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -54,7 +53,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/013 b/tests/nvme/013
index e3eb4e914750f429657efbed02fed8ce1aef4ffd..355bc2e03557c4bf5681a63e4efcacf45fb7ccf7 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -25,11 +25,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="${TMPDIR}/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -48,7 +47,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/014 b/tests/nvme/014
index cbafd802af1648749110fe9ef2a3dbe4ef26ef42..44ae91e2210fbea54145d7389a1e1f56879b5892 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -26,11 +26,10 @@ test() {
        local size
        local bs
        local count
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -60,7 +59,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/015 b/tests/nvme/015
index b32d16a91de8160dff3f517229da1fbf7967cb18..16e41ee65d42bf6c3ad8797ef73835e0b02fd828 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -25,11 +25,10 @@ test() {
        local size
        local bs
        local count
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -55,7 +54,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/017 b/tests/nvme/017
index 6f7ef5882d3e222c419372152feab52934b330c4..7cbf274c13b0f2a6c2ae4854dba4608efcdf65d4 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -19,20 +19,17 @@ test() {
        _setup_nvmet
 
        local port
-       local file_path
        local iterations="${nvme_num_iter}"
 
-       file_path="${TMPDIR}/img"
-
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
        local genctr=1
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
 
        for ((i = 2; i <= iterations; i++)); do
-               _create_nvmet_ns "${def_subsysnqn}" "${i}" "${file_path}"
+               _create_nvmet_ns "${def_subsysnqn}" "${i}" "${def_file_path}"
        done
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
@@ -49,7 +46,7 @@ test() {
 
        _remove_nvmet_subsystem "${def_subsysnqn}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/018 b/tests/nvme/018
index 155f094ea6b3b80294564436ac9b2ea9a11c16b2..d1d2082e62ac58024b89854103b83a6ee02b29f9 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -23,11 +23,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -52,7 +51,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/019 b/tests/nvme/019
index 4ac351cbb782821ac1eba0a6a87d443721d464be..2628dea55ac807cd14ec123cdddbaa9fcdc72d71 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -23,13 +23,12 @@ test() {
        local port
        local nvmedev
        local loop_dev
-       local file_path="$TMPDIR/img"
        local nblk_range="10,10,10,10,10,10,10,10,10,10"
        local sblk_range="100,200,300,400,500,600,700,800,900,1000"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -52,7 +51,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/020 b/tests/nvme/020
index 744d4b7d6805568fb68ee6a51ef66342dfdb4d73..4a4f3c12da30f24e227d642a9132c37b2f998ac3 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -21,13 +21,12 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
        local nblk_range="10,10,10,10,10,10,10,10,10,10"
        local sblk_range="100,200,300,400,500,600,700,800,900,1000"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -46,7 +45,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/021 b/tests/nvme/021
index 1fd9bcbb3d23fb2b52d7bf5be666499eb56d5ecb..11f82d64f378129f8c5e94f48bb8a1614decc87a 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -22,11 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -47,7 +46,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/022 b/tests/nvme/022
index 0539916252500e54804e43742b49b3df0df9d107..586f6cdd3448f9cd4452267d32257697bed7f5fc 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -22,11 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -47,7 +46,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/023 b/tests/nvme/023
index c10e5a0138a8ef52bbce9978c3ccbc19d115fda2..b13426cf5615a2f7c977851d0f9abc46b882830b 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -23,11 +23,10 @@ test() {
        local port
        local nvmedev
        local loop_dev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -52,7 +51,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/024 b/tests/nvme/024
index d1d7f0bfb99457e68d72dc9883bf379d6f38efa4..b7c7b3f64321e34d649b3863195a837f5c119060 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -22,11 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -46,7 +45,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/025 b/tests/nvme/025
index ea944830612bb9ae7a5aa98ac5ce5aeffc1ad9a4..04ceace5840bb997f423cbea9be2479005926a10 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -22,11 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -47,7 +46,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/026 b/tests/nvme/026
index f1193c20477c876ce86c43b1d33411a1cb4c5f70..a9dc7bc15db5e4a00ea4670b662284169fb180c9 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -22,11 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -47,7 +46,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/027 b/tests/nvme/027
index c097c51ea4f3a5e2e9ebc398fb11fdf0c3ec6f66..fda8c61405a5f7e2bcd33cc4d2a37514b4f033fd 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -22,11 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -46,7 +45,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/028 b/tests/nvme/028
index 6e37be4893b1a8e83a81df60ddf9c44dcda0fc59..8e42ea37a634520fe8a4ce7079e5f7e9de1efee2 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -22,11 +22,10 @@ test() {
 
        local port
        local nvmedev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -46,7 +45,7 @@ test() {
        _remove_nvmet_subsystem "${def_subsysnqn}"
        _remove_nvmet_port "${port}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/029 b/tests/nvme/029
index 4d0ca997404bf034a76985da22b1117c82cf8433..7988faf5dd0385ebe376d346edcf91a1f4519173 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -56,11 +56,10 @@ test() {
        local port
        local nvmedev
        local loop_dev
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                 "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -89,7 +88,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/031 b/tests/nvme/031
index 27b08e96dd0b2b84fdde5172fd0dc6fc4fcfba14..d5c2561b941b5d943e7722ee54f9a065100eeb1a 100755 (executable)
--- a/tests/nvme/031
+++ b/tests/nvme/031
@@ -33,9 +33,9 @@ test() {
        local loop_dev
        local port
 
-       truncate -s "${nvme_img_size}" "$TMPDIR/img"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "$TMPDIR/img")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
@@ -50,7 +50,7 @@ test() {
 
        _remove_nvmet_port "${port}"
        losetup -d "$loop_dev"
-       rm "$TMPDIR/img"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/040 b/tests/nvme/040
index 8d7f68f9a2d7c050e1af8f396cb3d3fd50484910..452ecd690edfdf4cac9be6304a2984f0b019452c 100755 (executable)
--- a/tests/nvme/040
+++ b/tests/nvme/040
@@ -21,14 +21,13 @@ test() {
 
        _setup_nvmet
 
-       local file_path="${TMPDIR}/img"
        local port
        local loop_dev
        local nvmedev
        local fio_pid
 
-       truncate -s "${nvme_img_size}" "${file_path}"
-       loop_dev="$(losetup -f --show "${file_path}")"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}"
@@ -60,7 +59,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm -f "${file_path}"
+       rm -f "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/041 b/tests/nvme/041
index 4c553251f37961148dca627abc385c27a56a355b..0a0700533b7bb9f2fcdd86a7734d6669f169ee7a 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -25,7 +25,6 @@ test() {
        _setup_nvmet
 
        local port
-       local file_path="${TMPDIR}/img"
        local hostkey
        local ctrldev
 
@@ -35,9 +34,9 @@ test() {
                return 1
        fi
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "b92842df-a394-44b1-84a4-92ae7d112861"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -69,7 +68,7 @@ test() {
 
        _remove_nvmet_host "${def_hostnqn}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/042 b/tests/nvme/042
index 866249ed598c69d2be2e021ce0b6c9ccb4773c75..9180fce17b4e79eee9540831aedfc8f1bf251bf9 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -25,15 +25,14 @@ test() {
        _setup_nvmet
 
        local port
-       local file_path="${TMPDIR}/img"
        local hmac
        local key_len
        local hostkey
        local ctrldev
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
        _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
@@ -82,7 +81,7 @@ test() {
 
        _remove_nvmet_host "${def_hostnqn}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/043 b/tests/nvme/043
index 5569a7a58ad5d2832d30ad99721e6829fd261be2..f08422949efbab9a9c3484e12baf33f8f1faffc9 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -26,7 +26,6 @@ test() {
        _setup_nvmet
 
        local port
-       local file_path="${TMPDIR}/img"
        local hash
        local dhgroup
        local hostkey
@@ -38,9 +37,9 @@ test() {
                return 1
        fi
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
        _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}"
@@ -84,7 +83,7 @@ test() {
 
        _remove_nvmet_host "${def_hostnqn}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/044 b/tests/nvme/044
index 6c2cb602313cb3e50e6425c765d8650dc78ba68d..5eb163db2c99e496243b675e508c8e77f8aa53bc 100755 (executable)
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -26,7 +26,6 @@ test() {
        _setup_nvmet
 
        local port
-       local file_path="${TMPDIR}/img"
        local hostkey
        local ctrlkey
        local ctrldev
@@ -43,9 +42,9 @@ test() {
                return 1
        fi
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
        _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" \
@@ -111,7 +110,7 @@ test() {
 
        _remove_nvmet_host "${def_hostnqn}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/045 b/tests/nvme/045
index a936e7fb661f5c61cc3342065d58d95605fed023..8364d5ec3a2baa1135d0c5603070e2d86001f16c 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -27,7 +27,6 @@ test() {
        _setup_nvmet
 
        local port
-       local file_path="${TMPDIR}/img"
        local hostkey
        local new_hostkey
        local ctrlkey
@@ -47,9 +46,9 @@ test() {
                return 1
        fi
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}"
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}"
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
        _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" "${ctrlkey}"
@@ -124,7 +123,7 @@ test() {
 
        _remove_nvmet_host "${def_hostnqn}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/047 b/tests/nvme/047
index b435dd3cecba004af6fddbd135348b03ae4261bb..66032f679ae298a70ba501c1089d8f82b11ae61c 100755 (executable)
--- a/tests/nvme/047
+++ b/tests/nvme/047
@@ -26,11 +26,10 @@ test() {
        local nvmedev
        local loop_dev
        local rand_io_size
-       local file_path="$TMPDIR/img"
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       loop_dev="$(losetup -f --show "${file_path}")"
+       loop_dev="$(losetup -f --show "${def_file_path}")"
 
        _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
                "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -61,7 +60,7 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/048 b/tests/nvme/048
index f9a19b1e655efad3c4fe1287a264bfa3e1af94a8..6a05feae9b823006d6072213a9359dd2997130f3 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -86,13 +86,12 @@ test() {
        _setup_nvmet
 
        local cfs_path="${NVMET_CFS}/subsystems/${def_subsysnqn}"
-       local file_path="${TMPDIR}/img"
        local skipped=false
        local port
 
-       truncate -s "${nvme_img_size}" "${file_path}"
+       truncate -s "${nvme_img_size}" "${def_file_path}"
 
-       _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
+       _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
                "b92842df-a394-44b1-84a4-92ae7d112861"
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
@@ -124,7 +123,7 @@ test() {
        _remove_nvmet_port "${port}"
        _remove_nvmet_host "${def_hostnqn}"
 
-       rm "${file_path}"
+       rm "${def_file_path}"
 
        if [[ "${skipped}" = true ]] ; then
                return 1