Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4797771pxk; Wed, 30 Sep 2020 11:57:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo/KHkfd2u6GCG1WhnGv92Hzop/TKQbE+EOwfUcBS9u5O/LAOfVOUPFw1MFqmEHVgMlbrl X-Received: by 2002:a17:906:82d1:: with SMTP id a17mr4191582ejy.385.1601492252601; Wed, 30 Sep 2020 11:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601492252; cv=none; d=google.com; s=arc-20160816; b=d7PofUYYFBavLCRaKMHpyL9lkgmg6Zn331ENSylofi7/pXZX1+5zxXVG0cEOSzgdHG xmWafueLhgi/SCQqRSYQ5ZYcWxIPUY2OeuSUIvGiN7wPeMpmGbQuBvq89oaOwZo706ht SQvSXN49uQF81gmR7oASVXg/O+mjCVg1kDHQiBDBSooJAzZtrcYJsGSGo2E5jEGjOSP7 Mf2uCKJKHXgGokd7xXXZQJCu1ky+e8kid39FcSbSVEJGtjOHCsyN5viHU1F1mhxYSP/8 zQ/IuWFTiz2vMCUu4kFidSswGUoILDauRDk0wlfkrY27wC4Tp3w9nVTmki4++ea5okj1 3yQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=tJSHvT1QhRVl+G04VHp6oB+MDJJauXzKMIhMmzCIDDM=; b=axHNIDmHdMXxsH4NXLvGw7G/9yE5ADP6ew3s5V6J8+dlRibqL4qYlIIAgUOCLMhZg9 2Y79MVmP1PmbK4IiNPNBs985BoqJaP+qDSS/h4KIdvMUdtHfAWartIKDAHWCQ9U5B++s G6NCj8qzKObcozI1FtLuWhfFOhCKca5y4CSRaf4w68dpY4yEoZXrb+WJ6p1bDjdWxHa8 hrDnTK0xRCgWE5CRcQPxXAlKKQSBFaxT6+ZHfg+tDpBjFeFSfMWkZKteqOVVHBgiQTDC irznRAD+P2Z8ewpInrxm0uDTeGEH9+4OGTozRB66WUupPxBMy0PnlQMXPH4KJ8GTd2gi BDxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@deltatee.com header.s=20200525 header.b="ZQOD/b/n"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s7si1743196edj.515.2020.09.30.11.57.09; Wed, 30 Sep 2020 11:57:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@deltatee.com header.s=20200525 header.b="ZQOD/b/n"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730054AbgI3SzD (ORCPT + 99 others); Wed, 30 Sep 2020 14:55:03 -0400 Received: from ale.deltatee.com ([204.191.154.188]:37550 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729848AbgI3Sye (ORCPT ); Wed, 30 Sep 2020 14:54:34 -0400 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=ZQOD/b/n4WQ66CxWM/hXXEMnhK 0NYEsye4QqL616Iw5u2GZboX3lty9Lq8lZODHVzOUhB+y/DLrbg7HypDABv4UYvUlcUw5kqtbTiMH QLIUfPGgkbYILPEtkuOAkxbd58IF+JnPtt5OAh1kSlSdaMjQqdd3P1l+y9GbDHGSDI9IqkJoEge6w XA1uld3DMwjGPmttwaMbphFCu3uoTSoe24ac18NwOnAtu1tOlzQfhK0TdNMeMFr1cIL2c6TRidfjJ WuW3uazKXx+d2/mmmJ18YzLhdNXvzGB5I4MQiry+tHnJ/tw/glq2TuPpcm5DaT3Wq/lPAuxpHLn9U IfEC3Vbw==; 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 1kNhFE-0000ux-52; Wed, 30 Sep 2020 12:54:32 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.92) (envelope-from ) id 1kNhFD-00030L-6Z; Wed, 30 Sep 2020 12:54:27 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, Omar Sandoval Cc: Sagi Grimberg , Chaitanya Kulkarni , Stephen Bates , Logan Gunthorpe , Chaitanya Kulkarni Date: Wed, 30 Sep 2020 12:54:12 -0600 Message-Id: <20200930185422.11494-2-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200930185422.11494-1-logang@deltatee.com> References: <20200930185422.11494-1-logang@deltatee.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on ale.deltatee.com X-Spam-Level: X-Spam-Status: No, score=-6.7 required=5.0 tests=ALL_TRUSTED,BAYES_00, MYRULES_NO_TEXT,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Subject: [PATCH blktests v2 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) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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