A missing " prevented the DPDK build in the matrix from functioning.
Correctly build DPDK as a single, shared library and point the OVS
build to the corresponding build directory. Also removes the 'make
install' as it is not needed.
Due to incorrect casts in the DPDK headers, we have to disable
bad-function-cast warnings as being treated as errors for now.
Signed-off-by: Thomas Graf <tg...@noironetworks.com>
Co-authored-by: Daniele Di Proietto <ddiproie...@vmware.com>
---
.travis.yml | 2 +-
.travis/build.sh | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fd21e30..b66f821 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install: ./.travis/prepare.sh
env:
- OPTS="--disable-ssl"
- TESTSUITE=1 KERNEL=1 OPTS="--with-linux=./linux-3.14.7"
- - KERNEL=1 DPDK=1 OPTS="--with-dpdk=./dpdk-1.7.0
+ - KERNEL=1 DPDK=1 OPTS="--with-dpdk=./dpdk-1.7.0/build"
script: ./.travis/build.sh $OPTS
diff --git a/.travis/build.sh b/.travis/build.sh
index 56623ea..8680f6e 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -3,6 +3,7 @@
set -o errexit
KERNELSRC=""
+CFLAGS="-Werror"
function install_kernel()
{
@@ -23,8 +24,9 @@ function install_dpdk()
cd dpdk-1.7.0
find ./ -type f | xargs sed -i
's/max-inline-insns-single=100/max-inline-insns-single=400/'
make config CC=gcc T=x86_64-native-linuxapp-gcc
+ sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' build/.config
+ sed -ri 's,(CONFIG_RTE_BUILD_COMBINE_LIBS=).*,\1y,' build/.config
make CC=gcc RTE_KERNELDIR=$KERNELSRC
- sudo make install CC=gcc T=x86_64-native-linuxapp-gcc
RTE_KERNELDIR=$KERNELSRC
echo "Installed DPDK source in $(pwd)"
cd ..
}
@@ -38,14 +40,19 @@ if [ "$KERNEL" ] || [ "$DPDK" ]; then
install_kernel
fi
-[ "$DPDK" ] && install_dpdk
+[ "$DPDK" ] && {
+ install_dpdk
+ # Disregard bad function casts until DPDK is fixed
+ CFLAGS="$CFLAGS -Wno-error=bad-function-cast"
+}
configure_ovs $*
+
if [ $CC = "clang" ]; then
- make CFLAGS="-Werror -Wno-error=unused-command-line-argument"
+ make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
else
- make CFLAGS="-Werror" C=1
+ make CFLAGS="$CFLAGS" C=1
[ "$TESTSUITE" ] && make distcheck
fi
--
1.9.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
