[PATCH blktests v1 01/11] nvme/{003,004,005,013,046,049}: Group all variables declarations

From: Daniel Wagner
Date: Wed Jul 26 2023 - 08:47:10 EST


Group all variable declarations together at the beginning of the
function.

Signed-off-by: Daniel Wagner <dwagner@xxxxxxx>
---
tests/nvme/003 | 3 ++-
tests/nvme/004 | 3 ++-
tests/nvme/005 | 5 +++--
tests/nvme/013 | 1 -
tests/nvme/046 | 1 +
tests/nvme/049 | 1 +
6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/nvme/003 b/tests/nvme/003
index 6604012d2068..aa26abf8d8b3 100755
--- 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 cab98ff44326..1e5c2b8b3e87 100755
--- 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 8e15a13f3794..836854086822 100755
--- 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 14e646a19c47..2be8681616d1 100755
--- 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 b37b9e98a559..942f25206c17 100755
--- 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 f72862c6426d..599ab58d7a29 100755
--- 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
--
2.41.0