From owner-svn-src-stable-12@freebsd.org  Mon Apr 13 21:23:39 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7CAE2A9920;
 Mon, 13 Apr 2020 21:23:39 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 491M6z4xH2z4Dpx;
 Mon, 13 Apr 2020 21:23:39 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4AE021FA1;
 Mon, 13 Apr 2020 21:23:39 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03DLNddv079583;
 Mon, 13 Apr 2020 21:23:39 GMT (envelope-from lwhsu@FreeBSD.org)
Received: (from lwhsu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03DLNdoC079582;
 Mon, 13 Apr 2020 21:23:39 GMT (envelope-from lwhsu@FreeBSD.org)
Message-Id: <202004132123.03DLNdoC079582@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to
 lwhsu@FreeBSD.org using -f
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Mon, 13 Apr 2020 21:23:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r359904 - stable/12/sbin/nvmecontrol/tests
X-SVN-Group: stable-12
X-SVN-Commit-Author: lwhsu
X-SVN-Commit-Paths: stable/12/sbin/nvmecontrol/tests
X-SVN-Commit-Revision: 359904
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Apr 2020 21:23:40 -0000

Author: lwhsu
Date: Mon Apr 13 21:23:39 2020
New Revision: 359904
URL: https://svnweb.freebsd.org/changeset/base/359904

Log:
  MFC r359903:
  
  Ensure `kyua list` working when there is no /dev/nvme*
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/sbin/nvmecontrol/tests/basic.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sbin/nvmecontrol/tests/basic.sh
==============================================================================
--- stable/12/sbin/nvmecontrol/tests/basic.sh	Mon Apr 13 21:08:54 2020	(r359903)
+++ stable/12/sbin/nvmecontrol/tests/basic.sh	Mon Apr 13 21:23:39 2020	(r359904)
@@ -33,7 +33,7 @@
 
 DANGEROUS=false # Set to true to run "dangerous" tests
 # Select a nvme device to use for testing. If none exist, use nvme0.
-TEST_DEV=$(cd /dev/;ls nvme[0-9]* | grep 'nvme[0-9][0-9]*$' | head -1) 2>/dev/null
+TEST_DEV=$(cd /dev/; ls -1 nvme[0-9]* 2> /dev/null | grep -E 'nvme[0-9][0-9]*$' | head -n 1)
 TEST_DEV=${TEST_DEV:-nvme0}
 TEST_DEV_PATH=/dev/${TEST_DEV}
 INV_OPT="-z"