diff options
| -rwxr-xr-x | .ci/after_success.sh | 2 | ||||
| -rwxr-xr-x | .ci/script.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | test/functional/ui/screen.lua | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/.ci/after_success.sh b/.ci/after_success.sh index e2602eac83..580b988061 100755 --- a/.ci/after_success.sh +++ b/.ci/after_success.sh @@ -7,4 +7,4 @@ if [[ -n "${CI_TARGET}" ]]; then exit fi -coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.' +[ "$USE_GCOV" = on ] && { coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.' ; } diff --git a/.ci/script.sh b/.ci/script.sh index 4d0666ec0e..c3c7b8dfa9 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -4,7 +4,7 @@ set -e set -o pipefail if [[ -n "${CI_TARGET}" ]]; then - make lint + make "${CI_TARGET}" exit 0 fi diff --git a/.travis.yml b/.travis.yml index 793053433f..5329dcaff1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ env: - CMAKE_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX - -DUSE_GCOV=ON -DBUSTED_OUTPUT_TYPE=gtest -DDEPS_PREFIX=$DEPS_BUILD_DIR/usr" - DEPS_CMAKE_FLAGS="-DDEPS_DOWNLOAD_DIR:PATH=$DEPS_DOWNLOAD_DIR" @@ -59,37 +58,34 @@ env: matrix: include: - os: linux - env: CI_TARGET=clint + env: CI_TARGET=lint - os: linux compiler: gcc-5 - env: GCOV=gcov-5 - os: linux # Travis creates a cache per compiler. # Set a different value here to store 32-bit # dependencies in a separate cache. compiler: gcc-5 -m32 - env: GCOV=gcov-5 BUILD_32BIT=ON + env: BUILD_32BIT=ON - os: linux compiler: clang-3.6 - env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=ASAN_UBSAN + env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=ASAN_UBSAN CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" - os: linux compiler: clang-3.6 - env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=MSAN + env: CLANG_SANITIZER=MSAN - os: linux compiler: clang-3.6 env: CLANG_SANITIZER=TSAN - os: osx compiler: clang - env: GCOV=gcov - os: osx compiler: gcc-4.9 - env: GCOV=gcov-4.9 - os: linux env: BUILD_MINGW=ON fast_finish: true allow_failures: # TODO: Remove when all MSan errors have been fixed. - - env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=MSAN + - env: CLANG_SANITIZER=MSAN before_install: .ci/before_install.sh install: .ci/install.sh diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index e1c2d14759..80f46326ee 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -119,7 +119,7 @@ if os.getenv('VALGRIND') then default_screen_timeout = default_screen_timeout * 3 end -if os.getenv('CI_TARGET') then +if os.getenv('CI') then default_screen_timeout = default_screen_timeout * 3 end |