linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-block@vger.kernel.org
Cc: osandov@osandov.com, Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH BLKTESTS V2 2/3] nvme/016: fix output format
Date: Tue, 19 Feb 2019 12:23:54 -0800	[thread overview]
Message-ID: <1550607835-11755-3-git-send-email-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <1550607835-11755-1-git-send-email-chaitanya.kulkarni@wdc.com>

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
 tests/nvme/016     |  4 +++-
 tests/nvme/016.out | 11 -----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/tests/nvme/016 b/tests/nvme/016
index 966d5dc..4269ef1 100755
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -34,7 +34,9 @@ test() {
 	port="$(_create_nvmet_port "loop")"
 	_add_nvmet_subsys_to_port "$port" "${subsys_nqn}"
 
-	nvme discover -t loop | sed -r -e "s/portid:  [0-9]+/portid:  X/"
+	if ! nvme discover -t loop | grep -q "${subsys_nqn}" ; then
+		echo "nvme discover command failed"
+	fi
 	_remove_nvmet_subsystem_from_port "${port}" "${subsys_nqn}"
 	_remove_nvmet_port "${port}"
 
diff --git a/tests/nvme/016.out b/tests/nvme/016.out
index 59bd293..fd244d5 100644
--- a/tests/nvme/016.out
+++ b/tests/nvme/016.out
@@ -1,13 +1,2 @@
 Running nvme/016
-
-Discovery Log Number of Records 1, Generation counter 1
-=====Discovery Log Entry 0======
-trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
-subnqn:  blktests-subsystem-1
-traddr:  
 Test complete
-- 
1.8.3.1


  reply	other threads:[~2019-02-19 20:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-19 20:23 [PATCH BLKTESTS V2 0/3] nvme: fix output formats Chaitanya Kulkarni
2019-02-19 20:23 ` Chaitanya Kulkarni [this message]
2019-02-19 20:23 ` [PATCH BLKTESTS V2 3/3] nvme/017: fix output format Chaitanya Kulkarni
     [not found] ` <1550607835-11755-2-git-send-email-chaitanya.kulkarni@wdc.com>
2019-02-20 18:03   ` [PATCH BLKTESTS V2 1/3] nvme/002: " Omar Sandoval
2019-02-20 18:28     ` Chaitanya Kulkarni
2019-02-20 19:35       ` Omar Sandoval
2019-02-21 15:04         ` Theodore Y. Ts'o
2019-02-22  0:00           ` Chaitanya Kulkarni
2019-02-27 19:00             ` Omar Sandoval

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=1550607835-11755-3-git-send-email-chaitanya.kulkarni@wdc.com \
    --to=chaitanya.kulkarni@wdc.com \
    --cc=linux-block@vger.kernel.org \
    --cc=osandov@osandov.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).