Merge #5077 from fwalch/travis/fix-gcov

Travis: Fix coveralls upload.

.ci/after_success.sh

@@ -3,8 +3,6 @@
 set -e
 set -o pipefail
 
-if [[ -n "${CI_TARGET}" ]]; then
-  exit
+if [[ -n "${GCOV}" ]]; then
+  coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.'
 fi
-
-[ "$USE_GCOV" = on ] && { coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.' ; }

.travis.yml

@@ -61,6 +61,7 @@ matrix:
       env: CI_TARGET=lint
     - os: linux
       compiler: gcc-5
+      env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
     - os: linux
       compiler: gcc-5
       env: FUNCTIONALTEST=functionaltest-lua
@@ -72,7 +73,7 @@ matrix:
       env: BUILD_32BIT=ON
     - os: linux
       compiler: clang
-      env: GCOV=llvm-cov CLANG_SANITIZER=ASAN_UBSAN CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+      env: CLANG_SANITIZER=ASAN_UBSAN
     - os: linux
       compiler: clang
       env: CLANG_SANITIZER=TSAN