From 8b45e46698af1bc8aafa897df33d0769bb4b13f8 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Tue, 4 Sep 2018 12:32:17 -0700 Subject: [PATCH] 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: Seth Howell Reviewed-on: https://review.gerrithub.io/424596 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker Chandler-Test-Pool: SPDK Automated Test System --- test/common/autotest_common.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 7f674eaf0..b82c3f4ab 100755 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -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