Instead of each individual test removing this file, just do it in the common helper. Signed-off-by: Logan Gunthorpe <logang@xxxxxxxxxxxx> --- common/fio | 1 + tests/nvme/010 | 1 - tests/nvme/011 | 1 - tests/nvme/012 | 1 - tests/nvme/013 | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/common/fio b/common/fio index 8bfad4238dda..94c65c107a14 100644 --- 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 2ed0f4871a30..25c79089e092 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -51,7 +51,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 974b33745b99..ad360d095ffc 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -47,7 +47,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 27981e903c58..dc86ee647729 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -61,7 +61,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 af5f3730a2fc..0ed52926363a 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -57,7 +57,6 @@ test() { _remove_nvmet_subsystem "${subsys_name}" _remove_nvmet_port "${port}" - rm -f local*verify*state rm "${file_path}" rm -fr "${mount_dir}" -- 2.20.1