* [PATCH BLKTESTS 0/3] nvme: fix output formats
@ 2019-02-18 18:53 Chaitanya Kulkarni
2019-02-18 18:53 ` [PATCH BLKTESTS 2/3] nvme/016: fix output format Chaitanya Kulkarni
2019-02-18 18:53 ` [PATCH BLKTESTS 3/3] nvme/017: " Chaitanya Kulkarni
0 siblings, 2 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-18 18:53 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
Hi Omar,
This is a small patch-series fixes output formats for the the discovery related
testcases. Due to change in the generation counter on the target side
and nvme-cli output we ended up fixing these cases.
-Regards,
Chaitanya
Chaitanya Kulkarni (3):
nvme/002: fix output format
nvme/016: fix output format
nvme/017: fix output format
tests/nvme/002.out | 4996 ++++++++++++++++++++++++++--------------------------
tests/nvme/016 | 5 +-
tests/nvme/016.out | 11 -
tests/nvme/017 | 5 +-
tests/nvme/017.out | 11 -
5 files changed, 2506 insertions(+), 2522 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH BLKTESTS 2/3] nvme/016: fix output format
2019-02-18 18:53 [PATCH BLKTESTS 0/3] nvme: fix output formats Chaitanya Kulkarni
@ 2019-02-18 18:53 ` Chaitanya Kulkarni
2019-02-18 18:53 ` [PATCH BLKTESTS 3/3] nvme/017: " Chaitanya Kulkarni
1 sibling, 0 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-18 18:53 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH BLKTESTS 3/3] nvme/017: fix output format
2019-02-18 18:53 [PATCH BLKTESTS 0/3] nvme: fix output formats Chaitanya Kulkarni
2019-02-18 18:53 ` [PATCH BLKTESTS 2/3] nvme/016: fix output format Chaitanya Kulkarni
@ 2019-02-18 18:53 ` Chaitanya Kulkarni
2019-02-19 16:17 ` Bart Van Assche
1 sibling, 1 reply; 5+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-18 18:53 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
tests/nvme/017 | 5 ++++-
tests/nvme/017.out | 11 -----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/nvme/017 b/tests/nvme/017
index 0b86bec..db87759 100755
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -37,7 +37,10 @@ test() {
port="$(_create_nvmet_port "loop")"
_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
- 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_name}"
_remove_nvmet_port "${port}"
diff --git a/tests/nvme/017.out b/tests/nvme/017.out
index 4b0877a..6ce9a80 100644
--- a/tests/nvme/017.out
+++ b/tests/nvme/017.out
@@ -1,13 +1,2 @@
Running nvme/017
-
-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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH BLKTESTS 3/3] nvme/017: fix output format
2019-02-18 18:53 ` [PATCH BLKTESTS 3/3] nvme/017: " Chaitanya Kulkarni
@ 2019-02-19 16:17 ` Bart Van Assche
2019-02-19 20:06 ` Chaitanya Kulkarni
0 siblings, 1 reply; 5+ messages in thread
From: Bart Van Assche @ 2019-02-19 16:17 UTC (permalink / raw)
To: Chaitanya Kulkarni, linux-block; +Cc: osandov
On Mon, 2019-02-18 at 10:53 -0800, Chaitanya Kulkarni wrote:
> Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
> ---
> tests/nvme/017 | 5 ++++-
> tests/nvme/017.out | 11 -----------
> 2 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/tests/nvme/017 b/tests/nvme/017
> index 0b86bec..db87759 100755
> --- a/tests/nvme/017
> +++ b/tests/nvme/017
> @@ -37,7 +37,10 @@ test() {
> port="$(_create_nvmet_port "loop")"
> _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
>
> - 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
Hi Chaitanya,
Please keep the code style consistent with other blktests code and write that
if-condition as follows:
if ! nvme discover -t loop | grep -q "${subsys_nqn}"; then
echo "nvme discover command failed"
fi
Thanks,
Bart.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH BLKTESTS 3/3] nvme/017: fix output format
2019-02-19 16:17 ` Bart Van Assche
@ 2019-02-19 20:06 ` Chaitanya Kulkarni
0 siblings, 0 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 20:06 UTC (permalink / raw)
To: Bart Van Assche, linux-block; +Cc: osandov
On 02/19/2019 08:17 AM, Bart Van Assche wrote:
> On Mon, 2019-02-18 at 10:53 -0800, Chaitanya Kulkarni wrote:
>> Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
>> ---
>> tests/nvme/017 | 5 ++++-
>> tests/nvme/017.out | 11 -----------
>> 2 files changed, 4 insertions(+), 12 deletions(-)
>>
>> diff --git a/tests/nvme/017 b/tests/nvme/017
>> index 0b86bec..db87759 100755
>> --- a/tests/nvme/017
>> +++ b/tests/nvme/017
>> @@ -37,7 +37,10 @@ test() {
>> port="$(_create_nvmet_port "loop")"
>> _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
>>
>> - 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
>
> Hi Chaitanya,
>
> Please keep the code style consistent with other blktests code and write that
> if-condition as follows:
>
> if ! nvme discover -t loop | grep -q "${subsys_nqn}"; then
> echo "nvme discover command failed"
> fi
>
> Thanks,
>
> Bart.
>
Sounds good, will send out new revision.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-02-19 20:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-18 18:53 [PATCH BLKTESTS 0/3] nvme: fix output formats Chaitanya Kulkarni
2019-02-18 18:53 ` [PATCH BLKTESTS 2/3] nvme/016: fix output format Chaitanya Kulkarni
2019-02-18 18:53 ` [PATCH BLKTESTS 3/3] nvme/017: " Chaitanya Kulkarni
2019-02-19 16:17 ` Bart Van Assche
2019-02-19 20:06 ` Chaitanya Kulkarni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.