Travis: use gcc for coverage instead of clang

This commit is contained in:
Alexey Sokolov
2015-08-25 22:47:07 +01:00
parent 06e52945b7
commit c0e1b09e8e
+6 -6
View File
@@ -10,7 +10,7 @@ env:
- BUILD_TYPE=normal
- BUILD_TYPE=asan
- BUILD_TYPE=tsan
- BUILD_TYPE=cov
- BUILD_TYPE=coverage
global:
- secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg="
matrix:
@@ -20,13 +20,13 @@ matrix:
- os: osx
env: BUILD_TYPE=tsan
- os: osx
env: BUILD_TYPE=cov
env: BUILD_TYPE=coverage
- compiler: gcc
env: BUILD_TYPE=asan
- compiler: gcc
env: BUILD_TYPE=tsan
- compiler: gcc
env: BUILD_TYPE=cov
- compiler: clang
env: BUILD_TYPE=coverage
- os: osx
compiler: gcc
include:
@@ -55,7 +55,7 @@ install:
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo apt-get install g++-4.8; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CFGFLAGS="$CFGFLAGS --with-gtest=/usr/src/gtest"; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_TYPE" == "cov" ]]; then sudo apt-get install lcov; gem install coveralls-lcov; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_TYPE" == "coverage" ]]; then sudo apt-get install lcov; gem install coveralls-lcov; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sw_vers; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep cpu; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep mem; fi
@@ -87,7 +87,7 @@ after_success:
echo "Not leader"
fi
- |
if [[ "$BUILD_TYPE" == "cov" ]]; then
if [[ "$BUILD_TYPE" == "coverage" ]]; then
cd build/
lcov --directory . --capture --output-file coverage.info
lcov --remove coverage.info '/usr/*' 'test/*' --output-file coverage.info