From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91D2BC433E7 for ; Thu, 8 Oct 2020 16:40:53 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 34636221FC for ; Thu, 8 Oct 2020 16:40:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pKCOj9cu"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=deltatee.com header.i=@deltatee.com header.b="JDQckPsn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34636221FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=deltatee.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:References:In-Reply-To: Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KuFpa88BSwbsfc2QdwHrzDHv3wZ6vZlYWKEB+94ONII=; b=pKCOj9cunp2wksTTJJ+KXDDlL TZlP8jESueIQQG4js1VTbvhsHTPGWRaSYqe/Zannnbek5hB6nGySD7bn63QZC0+f1cySqwGs4ILSJ QfYn53oTA1r86zLuDV8V7fFmlo3D6m/4SGC44LEpc07kwdpnNFrMa6BwvD3oMuBrWjn1QPpCyxdO4 XxgONrz5NsR3Jrb4VRoZcz4Jm7nHMWJ4f0DUfWhSA87T2WETBoyxy61wi4iVzmgSC+ovDSuBqnrXY j25jCwYHYw9ZN8JQWDDeGCzv3NaNw2VujXTcODEyPbtbF1ulPsu5KUswlMDkFOUfFhfAJgJ5ujFA+ j2Mt+AF8g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQYyI-0003Qs-EJ; Thu, 08 Oct 2020 16:40:50 +0000 Received: from ale.deltatee.com ([204.191.154.188]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQYy2-0003Js-Ig for linux-nvme@lists.infradead.org; Thu, 08 Oct 2020 16:40:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=deltatee.com; s=20200525; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=tJSHvT1QhRVl+G04VHp6oB+MDJJauXzKMIhMmzCIDDM=; b=JDQckPsnqx2Oaw6HFTKEzUPn9U s0753/8WVoatgJv+xtmbAsF4c4zqOzUc/YqvUYMEFsTjEG1VcGwTEombW+H9WLoUGVZQpK52xdmlO +o4jcGqeeyVGWL+rjhx7d7EWr9V5aVoyaacHvA14HbwtCgKWt4mkA8A4E7VZoYkFPCmDSLUo6z1ul //9KTVPIh6V6PONtOq4b9NcnbJRMl+Vjv3WBZep0foEwsIYciktSqkR71Aa2cTHMVpqf8fP1szqWi 2CDLVt4uQjmrpm2oOyyhyoFx17OG6dAUZ4RG39mopzNfUCodw9HDMFpBpNBDL3NKHXVVZTboHZ5Q1 F+ih8EbA==; Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kQYxz-0000ig-Pu; Thu, 08 Oct 2020 10:40:34 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.92) (envelope-from ) id 1kQYxy-0003HI-Pu; Thu, 08 Oct 2020 10:40:30 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, Omar Sandoval Date: Thu, 8 Oct 2020 10:40:14 -0600 Message-Id: <20201008164024.12546-2-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201008164024.12546-1-logang@deltatee.com> References: <20201008164024.12546-1-logang@deltatee.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, osandov@osandov.com, sagi@grimberg.me, sbates@raithlin.com, logang@deltatee.com, Chaitanya.Kulkarni@wdc.com, chaitanya.kulkarni@wdc.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH blktests v3 01/11] common/fio: Remove state file in common helper X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201008_124034_667617_44C703FC X-CRM114-Status: GOOD ( 11.66 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Logan Gunthorpe , Sagi Grimberg , Chaitanya Kulkarni , Stephen Bates Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Instead of each individual test removing this file, just do it in the common helper. Signed-off-by: Logan Gunthorpe Reviewed-by: Chaitanya Kulkarni --- 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 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme