From a581173e715af4f7ef4e6be232ed828bd7dea9b8 Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Wed, 14 May 2014 19:08:41 -0400 Subject: Turn off -Werror by default. It inteferes with development activities by breaking your build in the middle of a refactor. Instead, let's enable -Werror on the Travis CI builds via a TRAVIS_CI_BUILD option. --- scripts/travis.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/travis.sh b/scripts/travis.sh index 2b97773b22..b6632acb10 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -121,7 +121,7 @@ if [ "$TRAVIS_BUILD_TYPE" = "clang/asan" ]; then export SKIP_UNITTEST=1 export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works - $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON" + $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON" $MAKE_CMD if ! $MAKE_CMD test; then reset @@ -136,7 +136,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/unittest" ]; then export CC=gcc set_environment /opt/neovim-deps export SKIP_EXEC=1 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" unittest + $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" unittest coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.' elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then set_environment /opt/neovim-deps/32 @@ -159,7 +159,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then # correctly. sudo apt-get install libncurses5-dev:i386 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" unittest + $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" unittest $MAKE_CMD test elif [ "$TRAVIS_BUILD_TYPE" = "clint" ]; then ./scripts/clint.sh -- cgit