linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
	linux-block@vger.kernel.org, Omar Sandoval <osandov@osandov.com>
Cc: Sagi Grimberg <sagi@grimberg.me>,
	Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
	Stephen Bates <sbates@raithlin.com>,
	Logan Gunthorpe <logang@deltatee.com>,
	Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH blktests v3 01/11] common/fio: Remove state file in common helper
Date: Thu,  8 Oct 2020 10:40:14 -0600	[thread overview]
Message-ID: <20201008164024.12546-2-logang@deltatee.com> (raw)
In-Reply-To: <20201008164024.12546-1-logang@deltatee.com>

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>
---
 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 9d96d7803be3..0188e842213e 100755
--- 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 06dc568fb6ea..543dbe840874 100755
--- 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 8110430e49d4..1dbd59804ed7 100755
--- 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 176b11b9ccb5..df7f23e69252 100755
--- 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}"
 
-- 
2.20.1


  reply	other threads:[~2020-10-08 16:41 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-08 16:40 [PATCH blktests v3 00/11] NVMe Target Passthru Block Tests Logan Gunthorpe
2020-10-08 16:40 ` Logan Gunthorpe [this message]
2020-10-08 16:40 ` [PATCH blktests v3 02/11] common/xfs: Create common helper to check for XFS support Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 03/11] common/xfs: Create common helper to verify block device with xfs Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 04/11] nvme: Search for specific subsysnqn in _find_nvme_loop_dev Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 05/11] nvme: Add common helpers for passthru tests Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 06/11] nvme/033: Simple test to create and connect to a passthru target Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 07/11] nvme/034: Add test for passthru data verification Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 08/11] nvme/035: Add test to verify passthru controller with a filesystem Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 09/11] nvme/036: Add test for testing reset command on nvme-passthru Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 10/11] nvme/037: Add test which loops passthru connect and disconnect Logan Gunthorpe
2020-10-08 16:40 ` [PATCH blktests v3 11/11] nvme/038: Test removal of un-enabled subsystem and ports Logan Gunthorpe
2020-10-22 18:45 ` [PATCH blktests v3 00/11] NVMe Target Passthru Block Tests Logan Gunthorpe
2020-10-22 22:04   ` Omar Sandoval
2020-10-22 22:25     ` Logan Gunthorpe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201008164024.12546-2-logang@deltatee.com \
    --to=logang@deltatee.com \
    --cc=Chaitanya.Kulkarni@wdc.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=osandov@osandov.com \
    --cc=sagi@grimberg.me \
    --cc=sbates@raithlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).