diff --git a/.travis.yml b/.travis.yml index bcea120fa..967786acd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,9 +72,13 @@ install: before_script: - source bootstrap.sh - - mason install clang 3.8.0 - - export PATH=$(mason prefix clang 3.8.0)/bin:${PATH} - - which clang++ + - | + if [[ $(uname -s) == 'Linux' ]]; then + mason install clang 3.8.0 + export PATH=$(mason prefix clang 3.8.0)/bin:${PATH} + which clang++ + export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov" + fi - ccache --version - ccache -p || true - ccache --show-stats || true @@ -86,7 +90,7 @@ script: - cat config.log - make - make test - - enabled ${COVERAGE} export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov" && coverage + - enabled ${COVERAGE} coverage - enabled ${BENCH} make bench after_success: diff --git a/scripts/travis-common.sh b/scripts/travis-common.sh index 9cee676dc..2d4b03cc6 100644 --- a/scripts/travis-common.sh +++ b/scripts/travis-common.sh @@ -93,7 +93,7 @@ configure () { coverage () { ./mason_packages/.link/bin/cpp-coveralls \ --gcov ${LLVM_COV} \ - --build-root . --gcov-options '\-lp' \ + --build-root . \ --exclude mason_packages \ --exclude .sconf_temp --exclude benchmark --exclude deps \ --exclude scons --exclude test --exclude demo --exclude docs \