d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

Change-Id: I575d42f2b5caa38d9836f26b8aa6e414682d9554
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1548
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Darek Stojaczyk 2020-03-27 12:05:28 +01:00 committed by Tomasz Zawadzki
parent 3ac4e0a067
commit 5913f98d46
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/vhost/initiator/blockdev.sh
View File

@ -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