Thread (5 messages) 5 messages, 2 authors, 2019-02-19
STALE2692d
Revisions (2)
  1. v1 current
  2. v2 [diff vs current]

[PATCH BLKTESTS 2/3] nvme/016: fix output format

From: Chaitanya Kulkarni <hidden>
Date: 2019-02-18 18:53:47
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: Chaitanya Kulkarni <redacted>
---
 tests/nvme/016     |  5 ++++-
 tests/nvme/016.out | 11 -----------
 2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/nvme/016 b/tests/nvme/016
index 966d5dc..bb48c37 100755
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -34,7 +34,10 @@ 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/"
+	nvme discover -t loop | grep -q "${subsys_nqn}"
+	if [ $? -ne 0 ]; 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help