Unverified Commit b7e84d3f authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge pull request #448 from...

Merge pull request #448 from arthurafarias/arthurafarias-fix-lcov-relative-path-and-unnecessary-coverage-files

Fixing coverage support to compiler matrix and removed coverage of unnecessary files.
parents 34aa96e9 04073291
...@@ -12,32 +12,44 @@ matrix: ...@@ -12,32 +12,44 @@ matrix:
# Linux clang builds # Linux clang builds
- os: linux - os: linux
compiler: clang compiler: clang
env: COMPILER=clang++-4.0 env:
- COMPILER=clang++-4.0
- COV_TOOL=llvm-cov-4.0
- COV_TOOL_ARGS=gcov
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
packages: [ 'cmake', 'clang-4.0', 'libstdc++-6-dev', 'libssl-dev', 'libcurl4-openssl-dev', 'gdb', 'lcov' ] packages: [ 'cmake', 'clang-4.0', 'llvm-4.0-tools', 'libstdc++-6-dev', 'libssl-dev', 'libcurl4-openssl-dev', 'gdb', 'lcov' ]
- os: linux - os: linux
compiler: clang compiler: clang
env: COMPILER=clang++-5.0 env:
- COMPILER=clang++-5.0
- COV_TOOL=llvm-cov-5.0
- COV_TOOL_ARGS=gcov
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
packages: [ 'cmake', 'clang-5.0', 'libstdc++-6-dev', 'libssl-dev', 'libcurl4-openssl-dev', 'gdb', 'lcov' ] packages: [ 'cmake', 'clang-5.0', 'llvm-5.0-tools', 'libstdc++-6-dev', 'libssl-dev', 'libcurl4-openssl-dev', 'gdb', 'lcov' ]
- os: linux - os: linux
compiler: clang compiler: clang
env: COMPILER=clang++-6.0 env:
- COMPILER=clang++-6.0
- COV_TOOL=llvm-cov-6.0
- COV_TOOL_ARGS=gcov
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0']
packages: [ 'cmake', 'clang-6.0', 'libstdc++-6-dev', 'libssl-dev', 'libcurl4-openssl-dev', 'gdb', 'lcov' ] packages: [ 'cmake', 'clang-6.0', 'llvm-6.0-tools', 'libstdc++-6-dev', 'libssl-dev', 'libcurl4-openssl-dev', 'gdb', 'lcov' ]
# Linux GCC builds # Linux GCC builds
- os: linux - os: linux
compiler: gcc compiler: gcc
env: COMPILER=g++-4.9 env:
- COMPILER=g++-4.9
- COV_TOOL=gcov-4.9
- COV_TOOL_ARGS=
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
...@@ -45,7 +57,10 @@ matrix: ...@@ -45,7 +57,10 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: COMPILER=g++-5 env:
- COMPILER=g++-5
- COV_TOOL=gcov-5
- COV_TOOL_ARGS=
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
...@@ -53,7 +68,10 @@ matrix: ...@@ -53,7 +68,10 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: COMPILER=g++-6 env:
- COMPILER=g++-6
- COV_TOOL=gcov-6
- COV_TOOL_ARGS=
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
...@@ -61,7 +79,10 @@ matrix: ...@@ -61,7 +79,10 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: COMPILER=g++-7 env:
- COMPILER=g++-7
- COV_TOOL=gcov-7
- COV_TOOL_ARGS=
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
...@@ -69,7 +90,10 @@ matrix: ...@@ -69,7 +90,10 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: COMPILER=g++-8 env:
- COMPILER=g++-8
- COV_TOOL=gcov-8
- COV_TOOL_ARGS=
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
...@@ -127,8 +151,8 @@ after_failure: ...@@ -127,8 +151,8 @@ after_failure:
after_success: after_success:
- cd ../Build-Debug - cd ../Build-Debug
- export PISTACHE_SRC_ROOT=$(realpath $(pwd)/..) - sudo su -c "echo 'if [ \"\$1\" = \"-v\" ] ; then $COV_TOOL --version ; else $COV_TOOL $COV_TOOL_ARGS \$@ ; fi' > /usr/local/bin/cov-tool" && sudo chmod +x /usr/local/bin/cov-tool
- lcov --capture --directory . --output-file coverage.info - lcov --capture --gcov-tool cov-tool --directory . --output-file coverage.info
- lcov --remove coverage.info '/usr/*' "$PISTACHE_SRC_ROOT/test/*" "$PISTACHE_SRC_ROOT/googletest-release-1.7.0" --output-file coverage.info - lcov --remove coverage.info '/usr/*' '*tests/*' '*googletest-release-1.7.0/*' --output-file coverage.info
- lcov --list coverage.info - lcov --list coverage.info
- bash <(curl -s https://codecov.io/bash) -f coverage.info -t 1db5f955-be83-4bb5-8a8a-eeb4ad07ce11 || echo "Codecov did not collect coverage reports" - bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment