From 42fc807f4775ef734804eb677aa91412f373922d Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Thu, 19 Mar 2020 12:16:38 +0100
Subject: [PATCH] test/nvmf: Don't let nvmfcleanup() to fail upon finishing the
 test

If this function fails due to, e.g. modprobe not being able to unload
kernel modules, the errexit will prevent nvmftestfini() from killing
target applications.

Avoid this scenario by ignoring nvmfcleanup()'s es when called from
nvmftestfini().

Change-Id: I3a05261f71d3dcc6ed06f786b4cc1988fd733ffc
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1377
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Community-CI: Broadcom CI
---
 test/nvmf/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh
index b2c0d8de6..479447df2 100644
--- a/test/nvmf/common.sh
+++ b/test/nvmf/common.sh
@@ -217,7 +217,7 @@ function nvmfappstart()
 
 function nvmftestfini()
 {
-	nvmfcleanup
+	nvmfcleanup || :
 	if [ -n "$nvmfpid" ]; then
 		killprocess $nvmfpid
 	fi