Commit 3d11b2fe authored by Ben Walker's avatar Ben Walker Committed by Darek Stojaczyk
Browse files

vhost: Move test/vhost/common/common.sh up one directory 



This matches the pattern used in other tests.

Many of the tests use a COMMON_DIR defined up top.
Instead of changing where this points, because it's used
for multiple things, just change the places where it
is used to source common.sh. This is lower risk for now
until these are cleaned up later.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent d83a3489

test/vhost/common/common.sh→test/vhost/common.sh

+3 −3
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ set -e 
BASE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))



# Default running dir -> spdk/..

[[ -z "$TEST_DIR" ]] && TEST_DIR=$BASE_DIR/../../../../

[[ -z "$TEST_DIR" ]] && TEST_DIR=$BASE_DIR/../../../



TEST_DIR="$(mkdir -p $TEST_DIR && cd $TEST_DIR && echo $PWD)"

SPDK_BUILD_DIR=$BASE_DIR/../../../

SPDK_BUILD_DIR=$BASE_DIR/../../



SPDK_VHOST_SCSI_TEST_DIR=$TEST_DIR/vhost
@@ -72,7 +72,7 @@ mkdir -p $TEST_DIR 
#

# Source config describing QEMU and VHOST cores and NUMA

#

source $(readlink -f $(dirname ${BASH_SOURCE[0]}))/autotest.config

source $BASE_DIR/common/autotest.config



# Trace flag is optional, if it wasn't set earlier - disable it after sourcing

# autotest_common.sh

test/vhost/common/run_vhost.sh

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ fi 
notice "$0"

notice ""



. $COMMON_DIR/common.sh

. $COMMON_DIR/../common.sh



# Starting vhost with valid options

spdk_vhost_run $vhost_num --conf-path=$CONF_DIR

test/vhost/common/vm_run.sh

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ while getopts 'xah-:' optchar; do 
	esac

done



. $COMMON_DIR/common.sh

. $COMMON_DIR/../common.sh



if [[ $EUID -ne 0 ]]; then

	fail "Go away user come back as root"

test/vhost/common/vm_setup.sh

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ for param in "$@"; do 
	setup_params+=( "$param" )

done



. $COMMON_DIR/common.sh

. $COMMON_DIR/../common.sh



vm_setup ${setup_params[@]}

test/vhost/common/vm_shutdown.sh

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ while getopts "$optspec" optchar; do 
	esac

done



. $COMMON_DIR/common.sh

. $COMMON_DIR/../common.sh



if $do_kill && [[ $EUID -ne 0 ]]; then

	echo "Go away user come back as root"