Commit db4fc505 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/vfio_user: Fix traps 



Inner traps, those set by the tests, shouldn't override the global
ERR trap set by autotest_common.sh.

Change-Id: I057221884afee8d68a3c2b3cfe834faaad1b3f36
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22994


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent ea340dc4

test/vfio_user/nvme/common.sh

+2 −7
Original line number Diff line number Diff line
@@ -3,13 +3,8 @@ 
#  All rights reserved.



function clean_vfio_user() {

	trap - ERR

	print_backtrace

	set +e

	error "Error on $1 $2"

	vm_kill_all

	vhost_kill 0

	exit 1

	vm_kill_all || true

	vhost_kill 0 || true

}



function vfio_user_run() {

test/vfio_user/nvme/vfio_user_fio.sh

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock" 
fio_bin="--fio-bin=$FIO_BIN"

vm_no="2"



trap 'clean_vfio_user "${FUNCNAME}" "${LINENO}"' ERR

trap 'clean_vfio_user' EXIT

vhosttestinit



timing_enter start_vfio_user

test/vfio_user/nvme/vfio_user_restart_vm.sh

+1 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ source $rootdir/test/vfio_user/autotest.config 
bdfs=($(get_nvme_bdfs))

rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"



trap 'clean_vfio_user "${FUNCNAME}" "${LINENO}"' ERR EXIT

trap 'clean_vfio_user' EXIT



vhosttestinit
@@ -57,8 +57,4 @@ vm_shutdown_all 
$rpc_py bdev_nvme_detach_controller Nvme0

$rpc_py nvmf_delete_subsystem nqn.2019-07.io.spdk:cnode1



vhost_kill 0



trap - ERR EXIT



vhosttestfini