[PATCH blktests] nvmeof-mp/rc: fix nvmeof-mp failure when NVME_TARGET_PASSTHRU enabled

[PATCH blktests] nvmeof-mp/rc: fix nvmeof-mp failure when NVME_TARGET_PASSTHRU enabled

[Yi Zhang]

$ ./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

Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
---
 tests/nvmeof-mp/rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 &&
-- 
2.21.0

Re: [PATCH blktests] nvmeof-mp/rc: fix nvmeof-mp failure when NVME_TARGET_PASSTHRU enabled

[Bart Van Assche]

On 1/23/21 9:26 PM, Yi Zhang wrote:
> $ ./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
> 
> Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
> ---
>  tests/nvmeof-mp/rc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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 &&
> 

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Re: [PATCH blktests] nvmeof-mp/rc: fix nvmeof-mp failure when NVME_TARGET_PASSTHRU enabled

[Omar Sandoval]

On Sun, Jan 24, 2021 at 01:26:44PM +0800, Yi Zhang wrote:
> $ ./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
> 
> Signed-off-by: Yi Zhang <yi.zhang@redhat.com>

Thanks, applied.