From 0aa687a15d745b80c93f67792811b0bab2358134 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Sun, 17 Jul 2016 12:42:43 +0200
Subject: Travis: Fix coveralls upload.

---
 .ci/after_success.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.ci/after_success.sh b/.ci/after_success.sh
index 580b988061..0215eb139b 100755
--- a/.ci/after_success.sh
+++ b/.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.' ; }
-- 
cgit 


From f639c97c7200972bf44d01b48891c45707b43a17 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Sun, 17 Jul 2016 13:57:13 +0200
Subject: Travis: Run GCov on GCC-5 build.

Running coveralls with llvm-cov doesn't seem to work.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8334b03cdf..9d529c2632 100644
--- a/.travis.yml
+++ b/.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
-- 
cgit