]> www.infradead.org Git - users/sagi/blktests.git/commitdiff
nvme/040: Free loop back resources
authorDaniel Wagner <dwagner@suse.de>
Mon, 12 Jun 2023 14:29:45 +0000 (16:29 +0200)
committerShin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Thu, 15 Jun 2023 00:47:17 +0000 (09:47 +0900)
The tests does not cleanup all resources after it has finished. This
leads to rm not being able to remove the TMPDIR cleanly:

  + rm -rf blktests/results/tmpdir.nvme.040.m2J
  rm: cannot remove 'blktests/results/tmpdir.nvme.040.m2J': Directory not empty

Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
tests/nvme/040

index b6ab34d611baad428dea35db1cc68ffb7b3802f6..688a0939a3767b259aa88d512b957b2534ca2e8f 100755 (executable)
@@ -18,6 +18,7 @@ requires() {
 
 test() {
        local subsys="blktests-subsystem-1"
+       local file_path="${TMPDIR}/img"
        local port
        local loop_dev
        local nvmedev
@@ -26,8 +27,8 @@ test() {
        echo "Running ${TEST_NAME}"
 
        _setup_nvmet
-       truncate -s "${nvme_img_size}" "$TMPDIR/img"
-       loop_dev="$(losetup -f --show "$TMPDIR/img")"
+       truncate -s "${nvme_img_size}" "${file_path}"
+       loop_dev="$(losetup -f --show "${file_path}")"
 
        port="$(_create_nvmet_port "${nvme_trtype}")"
        _create_nvmet_subsystem "${subsys}" "${loop_dev}"
@@ -57,5 +58,9 @@ test() {
        _remove_nvmet_subsystem "${subsys}"
        _remove_nvmet_port "${port}"
 
+       losetup -d "${loop_dev}"
+
+       rm -f "${file_path}"
+
        echo "Test complete"
 }