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

test/vhost: Replace SPDK_BUILD_DIR with rootdir 



rootdir is the pattern used in the other tests

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


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

test/vhost/common.sh

+6 −8
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@ set -e 
: ${SPDK_VHOST_VERBOSE=false}

: ${QEMU_PREFIX="/usr/local/qemu/spdk-3.0.0"}



SPDK_BUILD_DIR=$rootdir



TEST_DIR=$(readlink -f $SPDK_BUILD_DIR/..)

TEST_DIR=$(readlink -f $rootdir/..)



SPDK_VHOST_SCSI_TEST_DIR=$TEST_DIR/vhost
@@ -132,7 +130,7 @@ function spdk_vhost_run() 
	done



	local vhost_dir="$(get_vhost_dir $vhost_num)"

	local vhost_app="$SPDK_BUILD_DIR/app/vhost/vhost"

	local vhost_app="$rootdir/app/vhost/vhost"

	local vhost_log_file="$vhost_dir/vhost.log"

	local vhost_pid_file="$vhost_dir/vhost.pid"

	local vhost_socket="$vhost_dir/usvhost"
@@ -162,7 +160,7 @@ function spdk_vhost_run() 
	local cmd="$vhost_app -m $reactor_mask -p $master_core -s $memory -r $vhost_dir/rpc.sock $no_pci"

	if [[ -n "$vhost_conf_path" ]]; then

		cp $vhost_conf_template $vhost_conf_file

		$SPDK_BUILD_DIR/scripts/gen_nvme.sh >> $vhost_conf_file

		$rootdir/scripts/gen_nvme.sh >> $vhost_conf_file

		cmd="$vhost_app -m $reactor_mask -p $master_core -c $vhost_conf_file -s $memory -r $vhost_dir/rpc.sock $no_pci"

	fi
@@ -179,12 +177,12 @@ function spdk_vhost_run() 
	waitforlisten "$vhost_pid" "$vhost_dir/rpc.sock"

	#do not generate nvmes if pci access is disabled

	if [[ -z "$vhost_conf_path" ]] && [[ -z "$no_pci" ]]; then

		$SPDK_BUILD_DIR/scripts/gen_nvme.sh "--json" | $SPDK_BUILD_DIR/scripts/rpc.py\

		$rootdir/scripts/gen_nvme.sh "--json" | $rootdir/scripts/rpc.py\

		 -s $vhost_dir/rpc.sock load_subsystem_config

	fi



	if [[ -n "$vhost_json_path" ]]; then

		$SPDK_BUILD_DIR/scripts/rpc.py -s $vhost_dir/rpc.sock load_config < "$vhost_json_path/conf.json"

		$rootdir/scripts/rpc.py -s $vhost_dir/rpc.sock load_config < "$vhost_json_path/conf.json"

	fi



	notice "vhost started - pid=$vhost_pid"
@@ -1115,7 +1113,7 @@ function run_fio() 
		return 0

	fi



	$SPDK_BUILD_DIR/test/vhost/common/run_fio.py --job-file=/root/$job_fname \

	$rootdir/test/vhost/common/run_fio.py --job-file=/root/$job_fname \

		$([[ ! -z "$fio_bin" ]] && echo "--fio-bin=$fio_bin") \

		--out=$out $json ${fio_disks%,}

}

test/vhost/fiotest/fio.sh

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ notice "" 
notice "Setting up VM"

notice ""



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

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



for vm_conf in ${vms[@]}; do

	IFS=',' read -ra conf <<< "$vm_conf"

test/vhost/hotplug/common.sh

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ fio_job=$testdir/fio_jobs/default_integrity.job 
tmp_attach_job=$testdir/fio_jobs/fio_attach.job.tmp

tmp_detach_job=$testdir/fio_jobs/fio_detach.job.tmp



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

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



function print_test_fio_header() {

    notice "==============="
@@ -201,7 +201,7 @@ function check_disks() { 


function get_traddr() {

    local nvme_name=$1

    local nvme="$( $SPDK_BUILD_DIR/scripts/gen_nvme.sh )"

    local nvme="$( $rootdir/scripts/gen_nvme.sh )"

    while read -r line; do

        if [[ $line == *"TransportID"* ]] && [[ $line == *$nvme_name* ]]; then

            local word_array=($line)

test/vhost/integrity/integrity_start.sh

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ done 
vhosttestinit



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

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

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



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

test/vhost/lvol/lvol_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ source $rootdir/test/common/autotest_common.sh 
source $rootdir/test/vhost/common.sh

source $rootdir/scripts/common.sh



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

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



vm_count=1

max_disks=""