Skip to content
This repository has been archived by the owner on Oct 10, 2019. It is now read-only.

Commit

Permalink
Fix coverage reports with GCC on Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Minoru committed May 17, 2016
1 parent 4d96efa commit 276d210
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
18 changes: 14 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -39,18 +45,22 @@ 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
- compiler: clang
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
Expand Down
2 changes: 1 addition & 1 deletion submit-to-coveralls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit 276d210

Please sign in to comment.