diff --git a/.travis.yml b/.travis.yml index d6d609af4..5ad34bc06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,15 @@ env: matrix: # ======================================================= + # TESTCOV Build + # ======================================================= + # TC. g++-4.8 | DEBUG | CDASH + - CMAKE_CXX_COMPILER=g++-4.8 + CMAKE_BUILD_TYPE=Debug + TESTCOV=ON + PUSH_TO_CDASH=TRUE + TCMALLOC=OFF + # ======================================================= # DEBUG Build # ======================================================= # D1. clang++-3.3 | DEBUG | TCMALLOC | CDASH @@ -86,15 +95,6 @@ env: CMAKE_BUILD_TYPE=DOXYGEN BUILD_DOXYGEN=TRUE TCMALLOC=OFF - # ======================================================= - # TESTCOV Build - # ======================================================= - # TC. g++-4.8 | DEBUG | CDASH - - CMAKE_CXX_COMPILER=g++-4.8 - CMAKE_BUILD_TYPE=Debug - TESTCOV=ON - PUSH_TO_CDASH=TRUE - TCMALLOC=OFF install: - until sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; do echo retry; done @@ -123,7 +123,8 @@ install: - if [[ $TESTCOV == ON ]]; then wget http://downloads.sourceforge.net/ltp/lcov-1.10.tar.gz; tar xvfz lcov-1.10.tar.gz; - cp -v lcov-1.10/bin/{lcov,genpng,gendesc,genhtml,geninfo} /usr/bin/; + sudo cp -v lcov-1.10/bin/{lcov,genpng,gendesc,genhtml,geninfo} /usr/bin/; + sudo chmod 777 /usr/bin/lcov /usr/bin/genhtml; rm -rf lcov-1.10.tar.gz lcov-1.10; fi @@ -159,12 +160,15 @@ before_script: script: - mkdir -p build - cd build - - if [[ $CMAKE_BUILD_TYPE == RELEASE && $CMAKE_CXX_COMPILER=clang++-3.3 ]]; - then - /usr/bin/cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DTCMALLOC=${TCMALLOC} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../src; + - if [[ $CMAKE_BUILD_TYPE == RELEASE && $CMAKE_CXX_COMPILER=clang++-3.3 ]]; then + GENERATOR=; else - /usr/bin/cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DTCMALLOC=${TCMALLOC} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src; + GENERATOR=-GNinja; fi + - if [[ $TESTCOV != ON ]]; then + TESTCOV=OFF; + fi + - /usr/bin/cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DTESTCOV=${TESTCOV} -DTCMALLOC=${TCMALLOC} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ${GENERATOR} -DCMAKE_PROGRAM_PATH=/usr/bin ../src; - if [[ $CMAKE_BUILD_TYPE == DEBUG || $CMAKE_BUILD_TYPE == RELEASE || $TESTCOV == ON ]]; then SITE=Ubuntu12.04@Travis; if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then