Commit 8b45e466 authored by Seth Howell's avatar Seth Howell Committed by Ben Walker
Browse files

test/common: update dpdk directory information 



The default directory for dpdk on centOS7, fedora28, and ubuntu 16.04 is
/usr/share/dpdk/x86_64-default-linuxapp-gcc. update autotest_common.sh
to reflect this. Also, add a build pool flag to control whether or not
to ignore that direcory.

Change-Id: I618b902ed04dd4a9f63c5bd2014a9fbb7fcbf91b
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/424596


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent b6ee6f92

test/common/autotest_common.sh

+4 −3
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ fi 
: ${SPDK_TEST_LVOL=1}; export SPDK_TEST_LVOL

: ${SPDK_RUN_ASAN=1}; export SPDK_RUN_ASAN

: ${SPDK_RUN_UBSAN=1}; export SPDK_RUN_UBSAN

: ${SPDK_RUN_INSTALLED_DPDK=1}; export SPDK_RUN_INSTALLED_DPDK



if [ -z "$DEPENDENCY_DIR" ]; then

	export DEPENDENCY_DIR=/home/sys_sgsw
@@ -98,7 +99,7 @@ DEFAULT_RPC_ADDR=/var/tmp/spdk.sock 
case `uname` in

	FreeBSD)

		DPDK_FREEBSD_DIR=/usr/local/share/dpdk/x86_64-native-bsdapp-clang

		if [ -d $DPDK_FREEBSD_DIR ]; then

		if [ -d $DPDK_FREEBSD_DIR ] && [ $SPDK_RUN_INSTALLED_DPDK -eq 1 ]; then

			WITH_DPDK_DIR=$DPDK_FREEBSD_DIR

		fi

		MAKE=gmake
@@ -107,8 +108,8 @@ case `uname` in 
		SPDK_RUN_UBSAN=0

		;;

	Linux)

		DPDK_LINUX_DIR=/usr/local/share/dpdk/x86_64-native-linuxapp-gcc

		if [ -d $DPDK_LINUX_DIR ]; then

		DPDK_LINUX_DIR=/usr/share/dpdk/x86_64-default-linuxapp-gcc

		if [ -d $DPDK_LINUX_DIR ] && [ $SPDK_RUN_INSTALLED_DPDK -eq 1 ]; then

			WITH_DPDK_DIR=$DPDK_LINUX_DIR

		fi

		MAKE=make