Skip to content

Commit

Permalink
travis: Remove sparse support.
Browse files Browse the repository at this point in the history
"sparse" failed to build with this old branch, see e.g.
https://travis-ci.org/openvswitch/ovs/jobs/436851158

Signed-off-by: Ben Pfaff <blp@ovn.org>
  • Loading branch information
blp committed Oct 16, 2018
1 parent a598e6a commit f7158fa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
9 changes: 1 addition & 8 deletions .travis/build.sh
Expand Up @@ -4,7 +4,6 @@ set -o errexit

KERNELSRC=""
CFLAGS="-Werror"
SPARSE_FLAGS=""
EXTRA_OPTS=""

function install_kernel()
Expand Down Expand Up @@ -77,9 +76,6 @@ if [ "$DPDK" ]; then
CFLAGS="$CFLAGS -Wno-cast-align"
fi
EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=./dpdk-$DPDK_VER/build"
elif [ "$CC" != "clang" ]; then
# DPDK headers currently trigger sparse errors
SPARSE_FLAGS="$SPARSE_FLAGS -Wsparse-error"
fi

configure_ovs $EXTRA_OPTS $*
Expand All @@ -91,11 +87,8 @@ fi

if [ "$CC" = "clang" ]; then
make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
elif [[ $BUILD_ENV =~ "-m32" ]]; then
# Disable sparse for 32bit builds on 64bit machine
make CFLAGS="$CFLAGS $BUILD_ENV"
else
make CFLAGS="$CFLAGS $BUILD_ENV $SPARSE_FLAGS" C=1
make CFLAGS="$CFLAGS $BUILD_ENV"
fi

if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then
Expand Down
3 changes: 1 addition & 2 deletions .travis/prepare.sh
@@ -1,4 +1,3 @@
#!/bin/bash

git clone git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
cd sparse && make && make install && cd ..

0 comments on commit f7158fa

Please sign in to comment.