From: Yi Zhang <yi.zhang@redhat.com>
Date: Wed, 27 Oct 2021 13:50:38 +0000 (+0800)
Subject: tests/nvme: misc fix and coding style update
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e786064baa294bc60d384588d925e3142132bc02;p=users%2Fhch%2Fblktests.git

tests/nvme: misc fix and coding style update

Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
---

diff --git a/tests/nvme/010 b/tests/nvme/010
index 150a4e5..08e39d5 100755
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -11,7 +11,7 @@ TIMED=1
 
 requires() {
 	_nvme_requires
-	_have_fio _have_modules loop
+	_have_fio && _have_modules loop
 	_require_nvme_trtype_is_fabrics
 }
 
diff --git a/tests/nvme/012 b/tests/nvme/012
index c4e75b0..6bb4972 100755
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -13,7 +13,7 @@ TIMED=1
 requires() {
 	_nvme_requires
 	_have_xfs
-	_have_program fio
+	_have_fio
 	_have_modules loop
 	_require_nvme_trtype_is_fabrics
 }
diff --git a/tests/nvme/030 b/tests/nvme/030
index 37df902..c6d485e 100755
--- a/tests/nvme/030
+++ b/tests/nvme/030
@@ -36,7 +36,7 @@ test() {
 
 	echo "Running ${TEST_NAME}"
 
-    _setup_nvmet
+	_setup_nvmet
 
 	port="$(_create_nvmet_port "${nvme_trtype}")"