nvme: Reorganize test preamble code section

This unifies all the tests preamble code section.

Reorganize all tests to start with printing the test name, then
the setting nvmet and finally followed by the variable declarations.

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/006 b/tests/nvme/006
index ea0db93791a734224865d10446066704fcaa1b03..b44c56b6a25d891e19a85e48872d6fa2cee24695 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -18,12 +18,12 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
+       _setup_nvmet
+
        local port
        local loop_dev
        local subsys_name="blktests-subsystem-1"
 
-       _setup_nvmet
-
        truncate -s "${nvme_img_size}" "$TMPDIR/img"
 
        loop_dev="$(losetup -f --show "$TMPDIR/img")"

diff --git a/tests/nvme/007 b/tests/nvme/007
index 243a79f5a254b770e844c0c31424a6a69d62d3fa..112432df7a9d7edc798439117128d6c9a6dcdbcf 100755 (executable)
--- a/tests/nvme/007
+++ b/tests/nvme/007
@@ -17,12 +17,12 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
+       _setup_nvmet
+
        local port
        local file_path
        local subsys_name="blktests-subsystem-1"
 
-       _setup_nvmet
-
        file_path="${TMPDIR}/img"
 
        truncate -s "${nvme_img_size}" "${file_path}"

diff --git a/tests/nvme/016 b/tests/nvme/016
index f617cf103900f4edf02d55f0567803ba54865795..cac0c0509acab8f76c1757ff1489c2e7d376b8f4 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -16,13 +16,13 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
+       _setup_nvmet
+
        local port
        local iterations="${nvme_num_iter}"
        local loop_dev
        local subsys_nqn="blktests-subsystem-1"
 
-       _setup_nvmet
-
        loop_dev="$(losetup -f)"
        local genctr=1
 

diff --git a/tests/nvme/017 b/tests/nvme/017
index 3dbb7c174b56f998a2d1252fe89a050d519230d8..429a25e8e01127fdec7a27a9c3757ce6e125ffa9 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -16,13 +16,13 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
+       _setup_nvmet
+
        local port
        local file_path
        local iterations="${nvme_num_iter}"
        local subsys_name="blktests-subsystem-1"
 
-       _setup_nvmet
-
        file_path="${TMPDIR}/img"
 
        truncate -s "${nvme_img_size}" "${file_path}"

diff --git a/tests/nvme/030 b/tests/nvme/030
index cfcdcbe6be23f15dd25dc275f6565dae293cb6c4..a0b999cace944aaed480e9d860aea58d8711bd5d 100755 (executable)
--- a/tests/nvme/030
+++ b/tests/nvme/030
@@ -16,14 +16,14 @@ requires() {
 }
 
 test() {
-       local port
-       local genctr
-       local subsys="blktests-subsystem-"
-
        echo "Running ${TEST_NAME}"
 
        _setup_nvmet
 
+       local port
+       local genctr
+       local subsys="blktests-subsystem-"
+
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
        _create_nvmet_subsystem "${subsys}1" "$(losetup -f)"

diff --git a/tests/nvme/031 b/tests/nvme/031
index e70898819a86e63e767f44bd54f9b4e844f2d1d8..27b08e96dd0b2b84fdde5172fd0dc6fc4fcfba14 100755 (executable)
--- a/tests/nvme/031
+++ b/tests/nvme/031
@@ -24,15 +24,15 @@ requires() {
 }
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys="blktests-subsystem-"
        local iterations=10
        local loop_dev
        local port
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
-
        truncate -s "${nvme_img_size}" "$TMPDIR/img"
 
        loop_dev="$(losetup -f --show "$TMPDIR/img")"

diff --git a/tests/nvme/033 b/tests/nvme/033
index 90aee817de5d6bd2ea0ea48b4994f13ed04e0a6e..5a4fac03bea0ed6f350f1495b80736970be31e27 100755 (executable)
--- a/tests/nvme/033
+++ b/tests/nvme/033
@@ -45,13 +45,14 @@ compare_dev_info() {
 }
 
 test_device() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys="blktests-subsystem-1"
        local nsdev
        local port
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
        port=$(_nvmet_passthru_target_setup "${subsys}")
 
        nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")

diff --git a/tests/nvme/034 b/tests/nvme/034
index e0ede717c373ccd94d8e5187b360c1f6eed74e07..334b2525d1b6d5618d4c752d6d408b34e4e7447c 100755 (executable)
--- a/tests/nvme/034
+++ b/tests/nvme/034
@@ -15,14 +15,15 @@ requires() {
 }
 
 test_device() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys="blktests-subsystem-1"
        local ctrldev
        local nsdev
        local port
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
        port=$(_nvmet_passthru_target_setup "${subsys}")
        nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
 

diff --git a/tests/nvme/035 b/tests/nvme/035
index 0896f7bb578d6a1bef1a7671121ccf84f7b11a66..68a9b608920e11aeb3b8cf6378220b548c5e73a5 100755 (executable)
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -21,14 +21,15 @@ device_requires() {
 }
 
 test_device() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys="blktests-subsystem-1"
        local ctrldev
        local nsdev
        local port
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
        port=$(_nvmet_passthru_target_setup "${subsys}")
        nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
 

diff --git a/tests/nvme/036 b/tests/nvme/036
index 8218c6538dfd8e4e098a2dbf947798392edb38ab..c3fc5d4a948ddc50aae2b5c7e690eccbdeb956ce 100755 (executable)
--- a/tests/nvme/036
+++ b/tests/nvme/036
@@ -14,13 +14,14 @@ requires() {
 }
 
 test_device() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys="blktests-subsystem-1"
        local ctrldev
        local port
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
        port=$(_nvmet_passthru_target_setup "${subsys}")
        nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
 

diff --git a/tests/nvme/037 b/tests/nvme/037
index fc6c21343652ecab5c33182cf601487e280200b7..5a78444b7e78f8c796995cb2ec48d75bf3a9f6cc 100755 (executable)
--- a/tests/nvme/037
+++ b/tests/nvme/037
@@ -13,15 +13,15 @@ requires() {
 }
 
 test_device() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys="blktests-subsystem-"
        local iterations=10
        local ctrldev
        local port
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
-
        for ((i = 0; i < iterations; i++)); do
                port=$(_nvmet_passthru_target_setup "${subsys}${i}")
                nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" \

diff --git a/tests/nvme/038 b/tests/nvme/038
index 24f02d4ad4d12bc14f51dd8d3571de9057e6d67f..5af28da03c3666823f666f77153345b01c5e7e94 100755 (executable)
--- a/tests/nvme/038
+++ b/tests/nvme/038
@@ -19,13 +19,13 @@ requires() {
 }
 
 test() {
-       local subsys_path="${NVMET_CFS}/subsystems/blktests-subsystem-1"
-       local port
-
        echo "Running ${TEST_NAME}"
 
        _setup_nvmet
 
+       local subsys_path="${NVMET_CFS}/subsystems/blktests-subsystem-1"
+       local port
+
        mkdir -p "${subsys_path}"
        rmdir "${subsys_path}"
 

diff --git a/tests/nvme/039 b/tests/nvme/039
index f327b54a8d00f3c5fd3d0eef9b7e5ab171892f5d..73b53d0b949c791f973f127fc369aeb764d84ff3 100755 (executable)
--- a/tests/nvme/039
+++ b/tests/nvme/039
@@ -131,12 +131,12 @@ inject_invalid_admin_cmd()
 }
 
 test_device() {
+       echo "Running ${TEST_NAME}"
+
        local nvme_verbose_errors
        local ns_dev
        local ctrl_dev
 
-       echo "Running ${TEST_NAME}"
-
        if _check_kernel_option NVME_VERBOSE_ERRORS; then
                nvme_verbose_errors=true
        else

diff --git a/tests/nvme/040 b/tests/nvme/040
index 688a0939a3767b259aa88d512b957b2534ca2e8f..3b76753132f37c23f97a17049206e072c6d251f5 100755 (executable)
--- a/tests/nvme/040
+++ b/tests/nvme/040
@@ -17,6 +17,10 @@ requires() {
 }
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys="blktests-subsystem-1"
        local file_path="${TMPDIR}/img"
        local port
@@ -24,9 +28,6 @@ test() {
        local nvmedev
        local fio_pid
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
        truncate -s "${nvme_img_size}" "${file_path}"
        loop_dev="$(losetup -f --show "${file_path}")"
 

diff --git a/tests/nvme/041 b/tests/nvme/041
index 5b04b99b128ed14d9da933cecb85dc11508e4db6..d8937915d622cc0d56114c53df88d0d3fff18156 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -20,6 +20,10 @@ requires() {
 
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
@@ -28,8 +32,6 @@ test() {
        local hostkey
        local ctrldev
 
-       echo "Running ${TEST_NAME}"
-
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
        hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
@@ -38,8 +40,6 @@ test() {
                return 1
        fi
 
-       _setup_nvmet
-
        truncate -s "${nvme_img_size}" "${file_path}"
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}" \

diff --git a/tests/nvme/042 b/tests/nvme/042
index 8df5ed37aaccdac66122ecf36ed3a9651f4f6730..af291cb33a0443dd24c7a0c8ec9725a1ed799230 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -20,6 +20,10 @@ requires() {
 
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
@@ -30,13 +34,9 @@ test() {
        local hostkey
        local ctrldev
 
-       echo "Running ${TEST_NAME}"
-
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
 
-       _setup_nvmet
-
        truncate -s "${nvme_img_size}" "${file_path}"
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}"

diff --git a/tests/nvme/043 b/tests/nvme/043
index 8f4b783a02ff229461b3120c12296b9d546653f3..4a37f91e50c301c9a11d2b2576618095a1dec33e 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -21,6 +21,10 @@ requires() {
 
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
@@ -31,8 +35,6 @@ test() {
        local hostkey
        local ctrldev
 
-       echo "Running ${TEST_NAME}"
-
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
        hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
@@ -41,8 +43,6 @@ test() {
                return 1
        fi
 
-       _setup_nvmet
-
        truncate -s "${nvme_img_size}" "${file_path}"
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}"

diff --git a/tests/nvme/044 b/tests/nvme/044
index fca0897af27bbcfcadf41ed8efdc3d5a8eb30e2e..27cb343f5ea7cf724c4e1ad1058c4475d530e039 100755 (executable)
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -21,6 +21,10 @@ requires() {
 
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
@@ -30,8 +34,6 @@ test() {
        local ctrlkey
        local ctrldev
 
-       echo "Running ${TEST_NAME}"
-
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
 
@@ -47,8 +49,6 @@ test() {
                return 1
        fi
 
-       _setup_nvmet
-
        truncate -s "${nvme_img_size}" "${file_path}"
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}"

diff --git a/tests/nvme/045 b/tests/nvme/045
index eca629a1869183cc9aab0bc177c0ebaeeedd9bc4..005d62d4f886e3da3882d9e4495f1155aa04e798 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -22,6 +22,10 @@ requires() {
 
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
@@ -34,8 +38,6 @@ test() {
        local ctrldev
        local rand_io_size
 
-       echo "Running ${TEST_NAME}"
-
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"
 
@@ -51,8 +53,6 @@ test() {
                return 1
        fi
 
-       _setup_nvmet
-
        truncate -s "${nvme_img_size}" "${file_path}"
 
        _create_nvmet_subsystem "${subsys_name}" "${file_path}"

diff --git a/tests/nvme/048 b/tests/nvme/048
index a6ebb8927865cc70ba6fa0ff61c51b4eb1f7e3c6..6efcd7d6ab0301b2562e7cd293abc572e3f3aa1b 100755 (executable)
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -81,6 +81,10 @@ set_qid_max() {
 }
 
 test() {
+       echo "Running ${TEST_NAME}"
+
+       _setup_nvmet
+
        local subsys_name="blktests-subsystem-1"
        local cfs_path="${NVMET_CFS}/subsystems/${subsys_name}"
        local file_path="${TMPDIR}/img"
@@ -89,10 +93,6 @@ test() {
        local hostid
        local port
 
-       echo "Running ${TEST_NAME}"
-
-       _setup_nvmet
-
        hostid="${def_hostid}"
        hostnqn="${def_hostnqn}"