diff options
| author | Florian Walch <florian@fwalch.com> | 2015-07-05 17:11:09 +0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-07-08 07:42:16 -0300 |
| commit | 78ec75fb60ca766bd3ba8a15581d0aa7653342c8 (patch) | |
| tree | 7667d971173fd8d0a95eab8a2d1096de5a237cc1 | |
| parent | d2eb4a934683b5da63000d8b79a0d4c9a314d1c0 (diff) | |
| download | rneovim-78ec75fb60ca766bd3ba8a15581d0aa7653342c8.tar.gz rneovim-78ec75fb60ca766bd3ba8a15581d0aa7653342c8.tar.bz2 rneovim-78ec75fb60ca766bd3ba8a15581d0aa7653342c8.zip | |
Travis: Use gcov that matches the used compiler.
This fixes gcov/coveralls warnings like the following:
Segmentation fault (core dumped)
charset.c.gcno:version '501*', prefer '406*'
Out of memory allocating 33061786568 bytes after a total of 2522648 bytes
http://stackoverflow.com/a/14676272/249642
| -rwxr-xr-x | .ci/after_success.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/.ci/after_success.sh b/.ci/after_success.sh index bc75e06b85..e2602eac83 100755 --- a/.ci/after_success.sh +++ b/.ci/after_success.sh @@ -7,4 +7,4 @@ if [[ -n "${CI_TARGET}" ]]; then exit fi -coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.' +coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.' diff --git a/.travis.yml b/.travis.yml index 80bd4c333f..becc7e8d3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,26 +64,29 @@ matrix: env: CI_TARGET=clint - os: linux compiler: gcc-5 + env: GCOV=gcov-5 - os: linux - env: BUILD_32BIT=ON # 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 - os: linux - env: CLANG_SANITIZER=ASAN_UBSAN compiler: clang-3.6 + env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=ASAN_UBSAN - os: linux - env: CLANG_SANITIZER=MSAN compiler: clang-3.6 + env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=MSAN # FIXME (tarruda): Uncomment when TSan tests don't hang anymore. #- os: linux - # env: CLANG_SANITIZER=TSAN # compiler: clang-3.6 + # env: GCOV=llvm-cov-3.6 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 |