From 862ac3b74a5da2b1cdf03e72aa1b3fa5a0258d7a Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Mon, 13 Apr 2020 21:08:54 +0000 Subject: [PATCH] Ensure `kyua list` working when there is no /dev/nvme* Sponsored by: The FreeBSD Foundation --- sbin/nvmecontrol/tests/basic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/tests/basic.sh b/sbin/nvmecontrol/tests/basic.sh index 738024ae17b2..4a3a8ed73c5c 100755 --- a/sbin/nvmecontrol/tests/basic.sh +++ b/sbin/nvmecontrol/tests/basic.sh @@ -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"