Skip to content

Commit 05496a3

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

20 files changed

Lines changed: 69 additions & 64 deletions

File tree

‎tests/nvme/006‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ requires() {
1818
test() {
1919
echo "Running ${TEST_NAME}"
2020

21+
_setup_nvmet
22+
2123
local port
2224
local loop_dev
2325
local subsys_name="blktests-subsystem-1"
2426

25-
_setup_nvmet
26-
2727
truncate -s "${nvme_img_size}" "$TMPDIR/img"
2828

2929
loop_dev="$(losetup -f --show "$TMPDIR/img")"

‎tests/nvme/007‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ requires() {
1717
test() {
1818
echo "Running ${TEST_NAME}"
1919

20+
_setup_nvmet
21+
2022
local port
2123
local file_path
2224
local subsys_name="blktests-subsystem-1"
2325

24-
_setup_nvmet
25-
2626
file_path="${TMPDIR}/img"
2727

2828
truncate -s "${nvme_img_size}" "${file_path}"

‎tests/nvme/016‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ requires() {
1616
test() {
1717
echo "Running ${TEST_NAME}"
1818

19+
_setup_nvmet
20+
1921
local port
2022
local iterations="${nvme_num_iter}"
2123
local loop_dev
2224
local subsys_nqn="blktests-subsystem-1"
2325

24-
_setup_nvmet
25-
2626
loop_dev="$(losetup -f)"
2727
local genctr=1
2828

‎tests/nvme/017‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ requires() {
1616
test() {
1717
echo "Running ${TEST_NAME}"
1818

19+
_setup_nvmet
20+
1921
local port
2022
local file_path
2123
local iterations="${nvme_num_iter}"
2224
local subsys_name="blktests-subsystem-1"
2325

24-
_setup_nvmet
25-
2626
file_path="${TMPDIR}/img"
2727

2828
truncate -s "${nvme_img_size}" "${file_path}"

‎tests/nvme/030‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ requires() {
1616
}
1717

1818
test() {
19-
local port
20-
local genctr
21-
local subsys="blktests-subsystem-"
22-
2319
echo "Running ${TEST_NAME}"
2420

2521
_setup_nvmet
2622

23+
local port
24+
local genctr
25+
local subsys="blktests-subsystem-"
26+
2727
port="$(_create_nvmet_port "${nvme_trtype}")"
2828

2929
_create_nvmet_subsystem "${subsys}1" "$(losetup -f)"

‎tests/nvme/031‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ requires() {
2424
}
2525

2626
test() {
27+
echo "Running ${TEST_NAME}"
28+
29+
_setup_nvmet
30+
2731
local subsys="blktests-subsystem-"
2832
local iterations=10
2933
local loop_dev
3034
local port
3135

32-
echo "Running ${TEST_NAME}"
33-
34-
_setup_nvmet
35-
3636
truncate -s "${nvme_img_size}" "$TMPDIR/img"
3737

3838
loop_dev="$(losetup -f --show "$TMPDIR/img")"

‎tests/nvme/033‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ compare_dev_info() {
4545
}
4646

4747
test_device() {
48+
echo "Running ${TEST_NAME}"
49+
50+
_setup_nvmet
51+
4852
local subsys="blktests-subsystem-1"
4953
local nsdev
5054
local port
5155

52-
echo "Running ${TEST_NAME}"
53-
54-
_setup_nvmet
5556
port=$(_nvmet_passthru_target_setup "${subsys}")
5657

5758
nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")

‎tests/nvme/034‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ requires() {
1515
}
1616

1717
test_device() {
18+
echo "Running ${TEST_NAME}"
19+
20+
_setup_nvmet
21+
1822
local subsys="blktests-subsystem-1"
1923
local ctrldev
2024
local nsdev
2125
local port
2226

23-
echo "Running ${TEST_NAME}"
24-
25-
_setup_nvmet
2627
port=$(_nvmet_passthru_target_setup "${subsys}")
2728
nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
2829

‎tests/nvme/035‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ device_requires() {
2121
}
2222

2323
test_device() {
24+
echo "Running ${TEST_NAME}"
25+
26+
_setup_nvmet
27+
2428
local subsys="blktests-subsystem-1"
2529
local ctrldev
2630
local nsdev
2731
local port
2832

29-
echo "Running ${TEST_NAME}"
30-
31-
_setup_nvmet
3233
port=$(_nvmet_passthru_target_setup "${subsys}")
3334
nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
3435

‎tests/nvme/036‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ requires() {
1414
}
1515

1616
test_device() {
17+
echo "Running ${TEST_NAME}"
18+
19+
_setup_nvmet
20+
1721
local subsys="blktests-subsystem-1"
1822
local ctrldev
1923
local port
2024

21-
echo "Running ${TEST_NAME}"
22-
23-
_setup_nvmet
2425
port=$(_nvmet_passthru_target_setup "${subsys}")
2526
nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
2627

0 commit comments

Comments
 (0)