nvme/{003,004,005,013,046,049}: Group all variables declarations

Group all variable declarations together at the beginning of the
function. Many of the nvme tests do this but not all. Thus make these
tests use the same style. This allows to spot the odd balls in the
refactoring of the tests.

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/003 b/tests/nvme/003
index 6604012d2068f9261dbb79146ae3bdfc8ddacbe7..aa26abf8d8b3ebff5e7ddbc8bcd38586b05d559b 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -22,10 +22,11 @@ test() {
 
        _setup_nvmet
 
+       local loop_dev
        local port
+
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
-       local loop_dev
        loop_dev="$(losetup -f)"
 
        _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}"

diff --git a/tests/nvme/004 b/tests/nvme/004
index cab98ff44326578e9d13228b14aed5de294d394f..1e5c2b8b3e87d406626676f80318385a98eb6135 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -23,11 +23,12 @@ test() {
        _setup_nvmet
 
        local port
+       local loop_dev
+
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
        truncate -s "${nvme_img_size}" "$TMPDIR/img"
 
-       local loop_dev
        loop_dev="$(losetup -f --show "$TMPDIR/img")"
 
        _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \

diff --git a/tests/nvme/005 b/tests/nvme/005
index 8e15a13f37948f6b2eca55f0c825c26b4383ec25..8368540868220a099523ecc11bf6822d5494f388 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -22,11 +22,13 @@ test() {
        _setup_nvmet
 
        local port
+       local loop_dev
+       local nvmedev
+
        port="$(_create_nvmet_port "${nvme_trtype}")"
 
        truncate -s "${nvme_img_size}" "$TMPDIR/img"
 
-       local loop_dev
        loop_dev="$(losetup -f --show "$TMPDIR/img")"
 
        _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
@@ -35,7 +37,6 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
 
-       local nvmedev
        nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
 
        udevadm settle

diff --git a/tests/nvme/013 b/tests/nvme/013
index 14e646a19c477afc9f5098d34261586f4513097f..2be8681616d156ddd65781801f32c0e090e9eeca 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -26,7 +26,6 @@ test() {
        local port
        local nvmedev
        local file_path="${TMPDIR}/img"
-
        local subsys_name="blktests-subsystem-1"
 
        truncate -s "${nvme_img_size}" "${file_path}"

diff --git a/tests/nvme/046 b/tests/nvme/046
index b37b9e98a5594c3e7dc5b9125de085ad7b1f97b2..942f25206c174c47df07143b17d955b239c66d1b 100755 (executable)
--- a/tests/nvme/046
+++ b/tests/nvme/046
@@ -16,6 +16,7 @@ requires() {
 
 test_device() {
        echo "Running ${TEST_NAME}"
+
        local ngdev=${TEST_DEV/nvme/ng}
        local perm nsid
 

diff --git a/tests/nvme/049 b/tests/nvme/049
index f72862c6426dd77b70573c477821af66b8b41862..599ab58d7a29d829acd94e4bcc0e1bbfaf245dcd 100755 (executable)
--- a/tests/nvme/049
+++ b/tests/nvme/049
@@ -17,6 +17,7 @@ requires() {
 
 test_device() {
        echo "Running ${TEST_NAME}"
+
        local ngdev=${TEST_DEV/nvme/ng}
        local common_args=(
                --size=1M