Further travis / coverity cleanups

This commit is contained in:
Jason Turner 2015-05-30 13:43:49 -06:00
parent aa60cffe85
commit ee672f5132

View File

@ -3,9 +3,9 @@ compiler:
- gcc
env:
matrix:
- CXX="g++-4.6" CC="gcc-4.6" GCOV="gcov-4.6"
- CXX="g++-4.8" CC="gcc-4.8" GCOV="gcov-4.8"
- CXX="g++-5.1" CC="gcc-5.1" GCOV="gcov-5.1" COVERALLS=1 CPPCHECK=1
- GCC_VER="4.8"
- GCC_VER="4.6"
- GCC_VER="5.1"
global:
- secure: eiaR6pXiiEpyB8+LLQ1NvZdl0Yylru1BLy9lMoHl+IpUNGGQGywmW/2WAn77rFfmR1OPA2qWQLfgPwgK0HxUA9HHlot9tre5QhiN2Lw8NOT8tCZ6tTm2+QntDBjBGJyal/knRvQkn/6qs6GxlXRerz4ArnnuPL1vESt3zwB0YtU=
@ -14,11 +14,14 @@ env:
- secure: "LfolGjP8tWm3yAwthfu3yp8Zn40aueFae580UUR34gusG87cyglq2tQDtxdy+63gWEeNfArbv9n5rZv+bDW3ggHyPjuCKKc1PlZAy07lfXUXf1uz+SFhNvNoYTn3mQG3VZ08o116p4Le2p8yqu4bylJ8wckEq7PrTwvSGVQWTWM="
before_install:
- if [ "$GCC_VER" = "4.6" ]; export CXX="g++-4.6" CC="gcc-4.6" GCOV="gcov-4.6"; fi
- if [ "$GCC_VER" = "4.8" ]; export CXX="g++-4.8" CC="gcc-4.8" GCOV="gcov-4.8"; fi
- if [ "$GCC_VER" = "5.1" ]; export CXX="g++-5.1" CC="gcc-5.1" GCOV="gcov-5.1" COVERALLS=1 CPPCHECK=1; fi
- sudo pip install cpp-coveralls
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update
- if [ "$CXX" = "g++-4.8" ]; then sudo apt-get install -qq g++-4.8; fi
- if [ "$CXX" = "g++-5.1" ]; then sudo apt-get install -qq g++-5.1; fi
- if [ "$GCC_VER" = "4.8" ]; then sudo apt-get install -qq g++-4.8; fi
- if [ "$GCC_VER" = "5.1" ]; then sudo apt-get install -qq g++-5.1; fi
script:
- if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . ; fi
@ -49,7 +52,7 @@ addons:
description: "Build submitted via Travis CI"
notification_email: jason@emptycrate.com
build_command_prepend: "cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug . "
build_command: "cmake --build . --target chai"
build_command: "cmake --build . -- -j2"
branch_pattern: coverity_scan