From: Yi Zhang <yi.zhang@redhat.com>
Date: Sun, 24 Jan 2021 05:26:44 +0000 (+0800)
Subject: nvmeof-mp/rc: fix nvmeof-mp failure when NVME_TARGET_PASSTHRU enabled
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e4a0b5ee4f78c59bdeefe1b8bb6e64d949df1bfb;p=users%2Fhch%2Fblktests.git

nvmeof-mp/rc: fix nvmeof-mp failure when NVME_TARGET_PASSTHRU enabled

$ ./check nvmeof-mp/001
nvmeof-mp/001 (Log in and log out)                           [passed]
    runtime  0.400s  ...  0.457s
rmdir: failed to remove 'subsystems/nvme-test/passthru/admin_timeout': Not a directory
rmdir: failed to remove 'subsystems/nvme-test/passthru/device_path': Not a directory
rmdir: failed to remove 'subsystems/nvme-test/passthru/enable': Not a directory
rmdir: failed to remove 'subsystems/nvme-test/passthru/io_timeout': Not a directory

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
---

diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
index c77526f..ab7770f 100755
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -265,8 +265,8 @@ stop_nvme_target() {
 			rm -f -- ports/*/subsystems/* &&
 			for d in {*/*/*/*,*/*}; do
 				[ -e "$d" ] &&
-					[ "$(basename "$(dirname "$d")")" != ana_groups ] &&
-					rmdir "$d"
+				[[ ! "$(basename "$(dirname "$d")")" =~ ana_groups|passthru ]] &&
+				rmdir "$d"
 			done
 	)
 	unload_module nvmet_rdma &&