From patchwork Tue Feb 19 20:23:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 10820789 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 0F3BB1399 for ; Tue, 19 Feb 2019 20:24:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F255B29F1F for ; Tue, 19 Feb 2019 20:24:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E691E2C495; Tue, 19 Feb 2019 20:24:08 +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 811EF2B7F1 for ; Tue, 19 Feb 2019 20:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726342AbfBSUYI (ORCPT ); Tue, 19 Feb 2019 15:24:08 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:2874 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726239AbfBSUYH (ORCPT ); Tue, 19 Feb 2019 15:24:07 -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=1550607848; x=1582143848; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ioVgQB2YOBMtQqKtVUT6VVYeVdByQ/KzwJLl++kgGK0=; b=At2mJzm35hcEPTClQNtPgtaMOm6U43UggRBrCkbkjVczRWZOOzJt/auf TXSpWltBwW87hB7t//6rb83QYneKkr6P0d8HhOclm2033/2Tl4DdJnDaZ p0PxGm9bRNTxcnA9UngNmFIJrWdBrjo/wwqUdrV1UmQHfDzbCu3OEaQrC X93nMjEQ8LcJgxXd5Wirx+bB/Nr5FV9c9h1G7dzCaL16LwrtBPw4793qH eQAucaAB40vSNHZzxC3QQmZhz2yEyhR5dsvttvW+3JCn8y9dV3/acTk51 YXPGNfJQ5Gn6jMCggmriVMya5KB3p201A4iuF4WU1IifB7m3zQK69RU2P w==; X-IronPort-AV: E=Sophos;i="5.58,388,1544457600"; d="scan'208";a="103418598" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 20 Feb 2019 04:24:08 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 19 Feb 2019 12:02:31 -0800 Received: from cmercuryqemu.hgst.com ([10.202.65.32]) by uls-op-cesaip01.wdc.com with ESMTP; 19 Feb 2019 12:24:07 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: osandov@osandov.com, Chaitanya Kulkarni Subject: [PATCH BLKTESTS V2 2/3] nvme/016: fix output format Date: Tue, 19 Feb 2019 12:23:54 -0800 Message-Id: <1550607835-11755-3-git-send-email-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550607835-11755-1-git-send-email-chaitanya.kulkarni@wdc.com> References: <1550607835-11755-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 | 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