Commit f04277f0 authored by John Meneghini's avatar John Meneghini Committed by Jim Harris
Browse files

test: remove more sys_sgsw dependencies from test scripts 



 - To override the default /home/sys_sgsw dependency
   add DEPENDENCY_DIR to ~/autorun-spdk.conf

  E.g.: DEPENDENCY_DIR=/home/vagrant

 - To override the default HUGEPAGES use
   add HUGEMEM to ~/autorun-spdk.conf

  E.g.: HUGEMEM=1024

Change-Id: Ib8db9d7d053ae319fe4c725159742875468d47f0
Signed-off-by: default avatarJohn Meneghini <johnm@netapp.com>
Signed-off-by: default avatarEd Rodriguez <ed.rodriguez@netapp.com>
Reviewed-on: https://review.gerrithub.io/415907


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 1e5705ee

test/common/autotest_common.sh

+12 −2
Original line number Diff line number Diff line
@@ -56,6 +56,16 @@ fi 
: ${SPDK_RUN_ASAN=1}; export SPDK_RUN_ASAN

: ${SPDK_RUN_UBSAN=1}; export SPDK_RUN_UBSAN



if [ -z "$DEPENDENCY_DIR" ]; then

	export DEPENDENCY_DIR=/home/sys_sgsw

else

	export DEPENDENCY_DIR

fi



if [ ! -z "$HUGEMEM" ]; then

	export HUGEMEM

fi



# pass our valgrind desire on to unittest.sh

if [ $SPDK_RUN_VALGRIND -eq 0 ]; then

	export valgrind=''
@@ -132,8 +142,8 @@ if [ -d /usr/src/fio ]; then 
	config_params+=' --with-fio=/usr/src/fio'

fi



if [ -d /home/sys_sgsw/vtune_codes ]; then

	config_params+=' --with-vtune=/home/sys_sgsw/vtune_codes'

if [ -d ${DEPENDENCY_DIR}/vtune_codes ]; then

	config_params+=' --with-vtune='${DEPENDENCY_DIR}'/vtune_codes'

fi



if [ -d /usr/include/rbd ] &&  [ -d /usr/include/rados ]; then

test/nvme/hotplug.sh

+8 −3
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ testdir=$(readlink -f $(dirname $0)) 
rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh



if [ -z "${DEPENDENCY_DIR}" ]; then

	echo DEPENDENCY_DIR not defined!

	exit 1

fi



function ssh_vm() {

	sshpass -p "$password" ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -p 10022 root@localhost "$@"

}
@@ -72,9 +77,9 @@ function devices_delete() { 
}



password=$1

base_img=/home/sys_sgsw/fedora24.img

test_img=/home/sys_sgsw/fedora24_test.img

qemu_pidfile=/home/sys_sgsw/qemupid

base_img=${DEPENDENCY_DIR}/fedora24.img

test_img=${DEPENDENCY_DIR}/fedora24_test.img

qemu_pidfile=${DEPENDENCY_DIR}/qemupid



if [ ! -e "$base_img" ]; then

	echo "Hotplug VM image not found; skipping test"

test/nvme/spdk_nvme_cli.sh

+7 −1
Original line number Diff line number Diff line
@@ -6,7 +6,13 @@ testdir=$(readlink -f $(dirname $0)) 
rootdir=$(readlink -f $testdir/../..)

source $rootdir/scripts/common.sh

source $rootdir/test/common/autotest_common.sh

spdk_nvme_cli="/home/sys_sgsw/nvme-cli"



if [ -z "${DEPENDENCY_DIR}" ]; then

        echo DEPENDENCY_DIR not defined!

        exit 1

fi



spdk_nvme_cli="${DEPENDENCY_DIR}/nvme-cli"



if [ ! -d $spdk_nvme_cli ]; then

	echo "nvme-cli repository not found at $spdk_nvme_cli; skipping tests."

test/nvmf/nvme_cli/nvme_cli.sh

+7 −1
Original line number Diff line number Diff line
@@ -4,7 +4,13 @@ testdir=$(readlink -f $(dirname $0)) 
rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/nvmf/common.sh

spdk_nvme_cli="/home/sys_sgsw/nvme-cli"



if [ -z "${DEPENDENCY_DIR}" ]; then

        echo DEPENDENCY_DIR not defined!

        exit 1

fi



spdk_nvme_cli="${DEPENDENCY_DIR}/nvme-cli"



MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=512