diff options
| author | Thomas Graf <tgraf@noironetworks.com> | 2014-09-11 21:34:22 +0200 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-09-11 12:37:45 -0700 |
| commit | ecc3c395b5a60af466e573ad8e53619f8d2eec76 (patch) | |
| tree | 6c77864a9cadd3cd0d9d27de51b85ccc96ba0793 /.travis | |
| parent | 95626395a3dbd91b69af80207d79b3ecab7643c9 (diff) | |
| download | openvswitch-ecc3c395b5a60af466e573ad8e53619f8d2eec76.tar.gz | |
travis: Fix DPDK build and treat bad-function-cast warning as non-error
A missing " prevented the DPDK build in the matrix from functioning
so far. This patch enables the DPDK build by properly building DPDK
as a single library and by pointing the OVS build to the corresponding
build directory. Also removes the 'make install' as it is not required
and only slows down the build.
Due to incorrect casts in the DPDK headers, we have to disable
bad-function-cast and cast-align warnings as being treated as errors
for now.
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Co-authored-by: Daniele Di Proietto <ddiproietto@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/build.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/.travis/build.sh b/.travis/build.sh index 56623eafe..0a2396924 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -3,6 +3,7 @@ set -o errexit KERNELSRC="" +CFLAGS="-Werror" function install_kernel() { @@ -22,9 +23,9 @@ function install_dpdk() tar xzvf dpdk-1.7.0.tar.gz > /dev/null cd dpdk-1.7.0 find ./ -type f | xargs sed -i 's/max-inline-insns-single=100/max-inline-insns-single=400/' + sed -ri 's,(CONFIG_RTE_BUILD_COMBINE_LIBS=).*,\1y,' config/common_linuxapp make config CC=gcc T=x86_64-native-linuxapp-gcc 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 +39,19 @@ if [ "$KERNEL" ] || [ "$DPDK" ]; then install_kernel fi -[ "$DPDK" ] && install_dpdk +[ "$DPDK" ] && { + install_dpdk + # Disregard bad function cassts until DPDK is fixed + CFLAGS="$CFLAGS -Wno-error=bad-function-cast -Wno-error=cast-align" +} 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 |