From 5913f98d4624d782954cf5c0cf3b8dfcd43225eb Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Fri, 27 Mar 2020 12:05:28 +0100 Subject: [PATCH] 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: Darek Stojaczyk Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1548 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker --- test/vhost/initiator/blockdev.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index 020433b4b..2f06316d9 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -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