From 276d2106960a61f13a60f82a4a3b4f8d83b2d152 Mon Sep 17 00:00:00 2001 From: Alexander Batischev Date: Tue, 17 May 2016 16:10:55 +0300 Subject: [PATCH] Fix coverage reports with GCC on Linux --- .travis.yml | 18 ++++++++++++++---- submit-to-coveralls.sh | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad400b37..b2faaf27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-4.9 - env: COMPILER=g++-4.9 + env: + - COMPILER=g++-4.9 + - GCOV=/usr/bin/gcov-4.9 - compiler: gcc os: linux addons: @@ -19,7 +21,9 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-5 - env: COMPILER=g++-5 + env: + - COMPILER=g++-5 + - GCOV=/usr/bin/gcov-5 - compiler: clang os: linux addons: @@ -29,7 +33,9 @@ matrix: - llvm-toolchain-precise-3.6 packages: - clang-3.6 - env: COMPILER=clang++-3.6 + env: + - COMPILER=clang++-3.6 + - GCOV=/usr/bin/gcov - compiler: clang os: linux addons: @@ -39,11 +45,14 @@ matrix: - llvm-toolchain-precise-3.7 packages: - clang-3.7 - env: COMPILER=clang++-3.7 + env: + - COMPILER=clang++-3.7 + - GCOV=/usr/bin/gcov - compiler: gcc os: osx env: - COMPILER=g++ + - GCOV=/usr/bin/gcov # a2x will run xmllint on generated files, so we have to pass the path # to AsciiDoc's catalog files - XML_CATALOG_FILES=/usr/local/etc/xml/catalog @@ -51,6 +60,7 @@ matrix: os: osx env: - COMPILER=clang++ + - GCOV=/usr/bin/gcov # a2x will run xmllint on generated files, so we have to pass the path # to AsciiDoc's catalog files - XML_CATALOG_FILES=/usr/local/etc/xml/catalog diff --git a/submit-to-coveralls.sh b/submit-to-coveralls.sh index 58ed4303..55e82cbb 100755 --- a/submit-to-coveralls.sh +++ b/submit-to-coveralls.sh @@ -5,4 +5,4 @@ then eval "$(pyenv init -)" fi -coveralls --exclude 'test' --exclude 'usr' --gcov-options '\-lp' +coveralls --exclude 'test' --exclude 'usr' --gcov $GCOV --gcov-options '\-lp'