From patchwork Mon Feb 18 18:53:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 10818611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 235F01399 for ; Mon, 18 Feb 2019 18:53:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 131AD2BBC7 for ; Mon, 18 Feb 2019 18:53:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 075B92BBFB; Mon, 18 Feb 2019 18:53:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C8702BBC7 for ; Mon, 18 Feb 2019 18:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727982AbfBRSxr (ORCPT ); Mon, 18 Feb 2019 13:53:47 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:25291 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727970AbfBRSxq (ORCPT ); Mon, 18 Feb 2019 13:53:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1550516026; x=1582052026; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=zzsda46lRSnbKt94qmViPYuk0vCPyGG0MOM2+wPXt4o=; b=WAdSasFik4JQ1SfKbYRA3rotr6z5gMY8Mb/fJGl+s9Avnxx49Y3hicHl tYmJe9ilzSsSeRg/eAJHo8gE2895elY1GkouZcl3oozBRQkkdUNgQvhND ThVNys/aAjhJ+jjkjngYTXhLjNur67Cp5bKKLwnL47Bz/9xz+FSBuCAFC JgJPb/I4R07otp+VU/04pgTV/pu1AschIZIroRk0ctrVtLFS75MYhFXnE HN3Rpz85ZYqDpSj8ONvo2QLyoNpqeTsZRgAvpxbJTBaXIrNeTpbfYWnBy GyHBnnotkyWxnKtojxPHbxUWsxaPRgu6tn4M+2hSkTYqwfd3ZZn5ECNCw g==; X-IronPort-AV: E=Sophos;i="5.58,385,1544457600"; d="scan'208";a="103321456" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 19 Feb 2019 02:53:46 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP; 18 Feb 2019 10:32:11 -0800 Received: from cmercuryqemu.hgst.com ([10.202.65.32]) by uls-op-cesaip02.wdc.com with ESMTP; 18 Feb 2019 10:53:46 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: osandov@osandov.com, Chaitanya Kulkarni Subject: [PATCH BLKTESTS 2/3] nvme/016: fix output format Date: Mon, 18 Feb 2019 10:53:41 -0800 Message-Id: <1550516022-16374-3-git-send-email-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550516022-16374-1-git-send-email-chaitanya.kulkarni@wdc.com> References: <1550516022-16374-1-git-send-email-chaitanya.kulkarni@wdc.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chaitanya Kulkarni --- 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 From patchwork Mon Feb 18 18:53:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 10818613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B71051390 for ; Mon, 18 Feb 2019 18:53:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A59D72BBC7 for ; Mon, 18 Feb 2019 18:53:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A12B2BBFB; Mon, 18 Feb 2019 18:53:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 405A62BBC7 for ; Mon, 18 Feb 2019 18:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727956AbfBRSxr (ORCPT ); Mon, 18 Feb 2019 13:53:47 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:25291 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727978AbfBRSxr (ORCPT ); Mon, 18 Feb 2019 13:53:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1550516027; x=1582052027; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WRCdYSJCtC6LqCn86WtJ7Qxn2bsJdGp9x9KIqDmwh5I=; b=rmA3T4bcohgjVQpe4gTAaSzg4oQoD9p6MS+auADoc6ZTDUrdrtJnckDm ipVUZUJCZY7A1MmE43O5kJN7i0R7GY2YaQa2CXAMfCVQXfUY08ZM/S7Y6 Ingxl7dyVXG3RziWFugyITbn/MLl1tszt3keyXZ0bzA5EMTuMatCdIBYZ XCs2sOrn6xugFCqnnrYFkqqUDtwMJo9X8Ove0RxPDizKrTGiKZmMZ8KZb 7uhQEq6yyL6Mb+mNEnpkkdfzHZHLnGme1qQN18uyAGPbt8LSJdKRX4Yma x0npUomdwF19ppYIBHBbVCVvZqXrr9KklSU1xzwqUKbhlwq/YFGiPMfoF A==; X-IronPort-AV: E=Sophos;i="5.58,385,1544457600"; d="scan'208";a="103321457" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 19 Feb 2019 02:53:47 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP; 18 Feb 2019 10:32:12 -0800 Received: from cmercuryqemu.hgst.com ([10.202.65.32]) by uls-op-cesaip02.wdc.com with ESMTP; 18 Feb 2019 10:53:47 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: osandov@osandov.com, Chaitanya Kulkarni Subject: [PATCH BLKTESTS 3/3] nvme/017: fix output format Date: Mon, 18 Feb 2019 10:53:42 -0800 Message-Id: <1550516022-16374-4-git-send-email-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550516022-16374-1-git-send-email-chaitanya.kulkarni@wdc.com> References: <1550516022-16374-1-git-send-email-chaitanya.kulkarni@wdc.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chaitanya Kulkarni --- 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