Skip to content

Commit 5b7fc0d

Browse files
dwsusekawasaki
dwsuse
authored and
kawasaki
committed
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 <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Shin'ichiro Kawasaki <[email protected]>
1 parent b6356f6 commit 5b7fc0d

34 files changed

Lines changed: 103 additions & 138 deletions

File tree

‎tests/nvme/004‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ test() {
2727

2828
port="$(_create_nvmet_port "${nvme_trtype}")"
2929

30-
truncate -s "${nvme_img_size}" "$TMPDIR/img"
30+
truncate -s "${nvme_img_size}" "${def_file_path}"
3131

32-
loop_dev="$(losetup -f --show "$TMPDIR/img")"
32+
loop_dev="$(losetup -f --show "${def_file_path}")"
3333

3434
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3535
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -47,7 +47,7 @@ test() {
4747
_remove_nvmet_subsystem "${def_subsysnqn}"
4848
_remove_nvmet_port "${port}"
4949
losetup -d "$loop_dev"
50-
rm "$TMPDIR/img"
50+
rm "${def_file_path}"
5151

5252
echo "Test complete"
5353
}

‎tests/nvme/005‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ test() {
2727

2828
port="$(_create_nvmet_port "${nvme_trtype}")"
2929

30-
truncate -s "${nvme_img_size}" "$TMPDIR/img"
30+
truncate -s "${nvme_img_size}" "${def_file_path}"
3131

32-
loop_dev="$(losetup -f --show "$TMPDIR/img")"
32+
loop_dev="$(losetup -f --show "${def_file_path}")"
3333

3434
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3535
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -49,7 +49,7 @@ test() {
4949

5050
_remove_nvmet_subsystem "${def_subsysnqn}"
5151
losetup -d "$loop_dev"
52-
rm "$TMPDIR/img"
52+
rm "${def_file_path}"
5353

5454
echo "Test complete"
5555
}

‎tests/nvme/006‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ test() {
2323
local port
2424
local loop_dev
2525

26-
truncate -s "${nvme_img_size}" "$TMPDIR/img"
26+
truncate -s "${nvme_img_size}" "${def_file_path}"
2727

28-
loop_dev="$(losetup -f --show "$TMPDIR/img")"
28+
loop_dev="$(losetup -f --show "${def_file_path}")"
2929

3030
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3131
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -38,7 +38,7 @@ test() {
3838

3939
losetup -d "$loop_dev"
4040

41-
rm "$TMPDIR/img"
41+
rm "${def_file_path}"
4242

4343
echo "Test complete"
4444
}

‎tests/nvme/007‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ test() {
2020
_setup_nvmet
2121

2222
local port
23-
local file_path
2423

25-
file_path="${TMPDIR}/img"
24+
truncate -s "${nvme_img_size}" "${def_file_path}"
2625

27-
truncate -s "${nvme_img_size}" "${file_path}"
28-
29-
_create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
26+
_create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
3027
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3128
port="$(_create_nvmet_port "${nvme_trtype}")"
3229
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -35,7 +32,7 @@ test() {
3532
_remove_nvmet_subsystem "${def_subsysnqn}"
3633
_remove_nvmet_port "${port}"
3734

38-
rm "${file_path}"
35+
rm "${def_file_path}"
3936

4037
echo "Test complete"
4138
}

‎tests/nvme/008‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ test() {
2323
local port
2424
local nvmedev
2525
local loop_dev
26-
local file_path="$TMPDIR/img"
2726

28-
truncate -s "${nvme_img_size}" "${file_path}"
27+
truncate -s "${nvme_img_size}" "${def_file_path}"
2928

30-
loop_dev="$(losetup -f --show "${file_path}")"
29+
loop_dev="$(losetup -f --show "${def_file_path}")"
3130

3231
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3332
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -50,7 +49,7 @@ test() {
5049

5150
losetup -d "${loop_dev}"
5251

53-
rm "${file_path}"
52+
rm "${def_file_path}"
5453

5554
echo "Test complete"
5655
}

‎tests/nvme/009‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ test() {
2121

2222
local port
2323
local nvmedev
24-
local file_path="$TMPDIR/img"
2524

26-
truncate -s "${nvme_img_size}" "${file_path}"
25+
truncate -s "${nvme_img_size}" "${def_file_path}"
2726

28-
_create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
27+
_create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
2928
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3029
port="$(_create_nvmet_port "${nvme_trtype}")"
3130
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -44,7 +43,7 @@ test() {
4443
_remove_nvmet_subsystem "${def_subsysnqn}"
4544
_remove_nvmet_port "${port}"
4645

47-
rm "${file_path}"
46+
rm "${def_file_path}"
4847

4948
echo "Test complete"
5049
}

‎tests/nvme/010‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ test() {
2323
local port
2424
local nvmedev
2525
local loop_dev
26-
local file_path="${TMPDIR}/img"
2726

28-
truncate -s "${nvme_img_size}" "${file_path}"
27+
truncate -s "${nvme_img_size}" "${def_file_path}"
2928

30-
loop_dev="$(losetup -f --show "${file_path}")"
29+
loop_dev="$(losetup -f --show "${def_file_path}")"
3130

3231
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3332
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -51,7 +50,7 @@ test() {
5150

5251
losetup -d "${loop_dev}"
5352

54-
rm "${file_path}"
53+
rm "${def_file_path}"
5554

5655
echo "Test complete"
5756
}

‎tests/nvme/011‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ test() {
2222

2323
local port
2424
local nvmedev
25-
local file_path
26-
local file_path="${TMPDIR}/img"
2725

28-
truncate -s "${nvme_img_size}" "${file_path}"
26+
truncate -s "${nvme_img_size}" "${def_file_path}"
2927

30-
_create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
28+
_create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
3129
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3230
port="$(_create_nvmet_port "${nvme_trtype}")"
3331
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -47,7 +45,7 @@ test() {
4745
_remove_nvmet_subsystem "${def_subsysnqn}"
4846
_remove_nvmet_port "${port}"
4947

50-
rm "${file_path}"
48+
rm "${def_file_path}"
5149

5250
echo "Test complete"
5351
}

‎tests/nvme/012‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ test() {
2727
local port
2828
local nvmedev
2929
local loop_dev
30-
local file_path="${TMPDIR}/img"
3130

32-
truncate -s "${nvme_img_size}" "${file_path}"
31+
truncate -s "${nvme_img_size}" "${def_file_path}"
3332

34-
loop_dev="$(losetup -f --show "${file_path}")"
33+
loop_dev="$(losetup -f --show "${def_file_path}")"
3534

3635
_create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \
3736
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
@@ -54,7 +53,7 @@ test() {
5453

5554
losetup -d "${loop_dev}"
5655

57-
rm "${file_path}"
56+
rm "${def_file_path}"
5857

5958
echo "Test complete"
6059
}

‎tests/nvme/013‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ test() {
2525

2626
local port
2727
local nvmedev
28-
local file_path="${TMPDIR}/img"
2928

30-
truncate -s "${nvme_img_size}" "${file_path}"
29+
truncate -s "${nvme_img_size}" "${def_file_path}"
3130

32-
_create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \
31+
_create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \
3332
"91fdba0d-f87b-4c25-b80f-db7be1418b9e"
3433
port="$(_create_nvmet_port "${nvme_trtype}")"
3534
_add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}"
@@ -48,7 +47,7 @@ test() {
4847
_remove_nvmet_subsystem "${def_subsysnqn}"
4948
_remove_nvmet_port "${port}"
5049

51-
rm "${file_path}"
50+
rm "${def_file_path}"
5251

5352
echo "Test complete"
5453
}

0 commit comments

Comments
 (0)