common/fio: Remove state file in common helper

Instead of each individual test removing this file, just do it
in the common helper.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

diff --git a/common/fio b/common/fio
index 8bfad4238ddaa86faf70d8db98b7bbcb9d5aff15..94c65c107a144223bab8784b78eae653e5212283 100644 (file)
--- a/common/fio
+++ b/common/fio
@@ -181,6 +181,7 @@ _run_fio_rand_io() {
 _run_fio_verify_io() {
        _run_fio --name=verify --rw=randwrite --direct=1 --ioengine=libaio --bs=4k \
                --iodepth=16 --verify=crc32c "$@"
+       rm -f local*verify*state
 }
 
 _fio_perf_report() {

diff --git a/tests/nvme/010 b/tests/nvme/010
index 9d96d7803be3da04dce94dd0d9f88b1b34a90ff5..0188e842213e8b512c76fdb5473ed5d0970a00bb 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -52,7 +52,6 @@ test() {
        losetup -d "${loop_dev}"
 
        rm "${file_path}"
-       rm -f local*verify*state
 
        echo "Test complete"
 }

diff --git a/tests/nvme/011 b/tests/nvme/011
index 06dc568fb6ea6ff085298ad2382fe415911817b1..543dbe840874f1d105c4f2dfd20e380099b1c3ca 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -48,7 +48,6 @@ test() {
        _remove_nvmet_port "${port}"
 
        rm "${file_path}"
-       rm -f local-write-and-verify*state
 
        echo "Test complete"
 }

diff --git a/tests/nvme/012 b/tests/nvme/012
index 8110430e49d4b8d1d62f54b83a6b6a65e90a3533..1dbd59804ed716239951a354f4e734563b329517 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -63,7 +63,6 @@ test() {
 
        losetup -d "${loop_dev}"
 
-       rm -f local*verify*state
        rm "${file_path}"
        rm -fr "${mount_dir}"
 

diff --git a/tests/nvme/013 b/tests/nvme/013
index 176b11b9ccb5f3a4c7cd0d449e588af31142b161..df7f23e692525e8389023ded6799846a2fbf7d36 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -58,7 +58,6 @@ test() {
        _remove_nvmet_subsystem "${subsys_name}"
        _remove_nvmet_port "${port}"
 
-       rm -f local*verify*state
        rm "${file_path}"
        rm -fr "${mount_dir}"