Commit 6de97c1a authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

test/vhost: Add calls to vhosttestinit and vhosttestfini 



Change-Id: I0b564a6931b91f5226ad6a6909c5285f5cb76a71
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454944


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 0a48fd06

test/vhost/fiotest/fio.sh

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ if [[ ! -r "$fio_job" ]]; then 
	fail "no fio job file specified"

fi



vhosttestinit



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



vm_kill_all
@@ -263,3 +265,5 @@ else 
	notice ""

	notice "==============="

fi



vhosttestfini

test/vhost/initiator/blockdev.sh

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ while getopts 'h-:' optchar; do 
	esac

done



vhosttestinit



source $testdir/autotest.config

PLUGIN_DIR=$rootdir/examples/bdev/fio_plugin

RPC_PY="$rootdir/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
@@ -203,3 +205,5 @@ $RPC_PY delete_nvme_controller Nvme0 
timing_enter spdk_vhost_kill

spdk_vhost_kill

timing_exit spdk_vhost_kill



vhosttestfini

test/vhost/integrity/integrity_start.sh

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ while getopts 'xh-:' optchar; do 
	esac

done



vhosttestinit



. $(readlink -e "$(dirname $0)/../common.sh") || exit 1

rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
@@ -98,3 +100,5 @@ $rpc_py delete_nvme_controller Nvme0 


notice "Shutting down SPDK vhost app..."

spdk_vhost_kill



vhosttestfini

test/vhost/lvol/lvol_test.sh

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ while getopts 'xh-:' optchar; do 
    esac

done



vhosttestinit



notice "Get NVMe disks:"

nvmes=($(iter_pci_class_code 01 08 02))
@@ -282,3 +284,5 @@ $rpc_py get_vhost_controllers 


notice "Shutting down SPDK vhost app..."

spdk_vhost_kill



vhosttestfini

test/vhost/migration/migration.sh

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ for param in "$@"; do 
	esac

done



vhosttestinit



. $(readlink -e "$(dirname $0)/../common.sh") || exit 1

MIGRATION_DIR=$(readlink -f $(dirname $0))
@@ -149,3 +151,5 @@ notice "Migration Test SUCCESS" 
notice "==============="



trap - SIGINT ERR EXIT



vhosttestfini