From a940721a2958f89024d79ea733cd0d18faf319b1 Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Mon, 2 Mar 2020 21:48:33 +0100
Subject: [PATCH] test/bdev: Use separate function for cleaning lingering files

Change-Id: Ib44dbf1a4ec8e44f26cb8219e53b3ed1ae03d48b
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1095
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
---
 test/bdev/blockdev.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index d02445817..2fb1a4d3f 100755
--- a/test/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -10,6 +10,14 @@ conf_file="$testdir/bdev.conf"
 # Make sure the configuration is clean
 :>"$conf_file"
 
+function cleanup() {
+	rm -f "/tmp/aiofile"
+	rm -f "/tmp/spdk-pmem-pool"
+	rm -f "$conf_file"
+
+	rbd_cleanup
+}
+
 function start_spdk_tgt() {
 	local spdk_cmd
 
@@ -371,7 +379,4 @@ if [ "$test_type" = "gpt" ]; then
 	part_dev_by_gpt $conf_file Nvme0n1 $rootdir reset
 fi
 
-rm -f /tmp/aiofile
-rm -f /tmp/spdk-pmem-pool
-rm -f $conf_file
-rbd_cleanup
+cleanup