diff options
| author | Ben Pfaff <blp@ovn.org> | 2018-10-16 13:57:10 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-03-18 13:37:42 -0700 |
| commit | 2819e83bde5c56ddcd54a3ac6066545a399a539e (patch) | |
| tree | 6593612223da98313527ea72f148a0d67c42199f | |
| parent | 82b6a499873862a09d2648b767e70262abf5a4ab (diff) | |
| download | openvswitch-branch-2.4.tar.gz | |
travis: Remove sparse support.branch-2.4
"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>
| -rwxr-xr-x | .travis/build.sh | 9 | ||||
| -rwxr-xr-x | .travis/prepare.sh | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/.travis/build.sh b/.travis/build.sh index e90f4d08b..46ba8c106 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -4,7 +4,6 @@ set -o errexit KERNELSRC="" CFLAGS="-Werror" -SPARSE_FLAGS="" EXTRA_OPTS="" function install_kernel() @@ -79,9 +78,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 $* @@ -93,11 +89,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 diff --git a/.travis/prepare.sh b/.travis/prepare.sh index cfc1b174f..7a693aac0 100755 --- a/.travis/prepare.sh +++ b/.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 .. + |