Commit 5913f98d authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Tomasz Zawadzki
Browse files

test/vhost/initiator: don't override the ERR trap 



It's set once in autotest_common.sh and must not be set anywhere else.

Change-Id: I575d42f2b5caa38d9836f26b8aa6e414682d9554
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1548


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 3ac4e0a0

test/vhost/initiator/blockdev.sh

+4 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ vhosttestinit 
source $testdir/autotest.config

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



trap '$(get_vhost_dir)/Virtio0;

	error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT



function run_spdk_fio() {

	fio_bdev --ioengine=spdk_bdev "$@" --spdk_mem=1024 --spdk_single_seg=1

}
@@ -57,6 +54,8 @@ timing_enter vhost_run 
vhost_run 0

timing_exit vhost_run



trap 'vhost_kill 0; vhosttestfini; exit 1' SIGINT SIGTERM EXIT



timing_enter create_bdev_config

create_bdev_config

timing_exit create_bdev_config
@@ -72,6 +71,8 @@ timing_exit run_spdk_fio_unmap 


$RPC_PY bdev_nvme_detach_controller Nvme0



trap - SIGINT SIGTERM EXIT



timing_enter vhost_kill

vhost_kill 0

timing_exit vhost_kill