diff --git a/.travis.yml b/.travis.yml index 2e54aee0d..e0d6b046c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,9 @@ env: - CXXFLAGS="-O2 -march=native -mtune=native -Wunreachable-code" matrix: # special CXXFLAGS for maximum speed, overrides global CXXFLAGS, CHECK_CLANG is the var that controls if we download and check clang in that travis job - - SRCDIR=build CHECK_CLANG=yes VERIFY=1 - - MAKEFLAGS="HAVE_RULES=yes" SRCDIR=build VERIFY=1 - - SRCDIR=build VERIFY=1 - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL" + - SRCDIR=build CHECK_CLANG=yes VERIFY=1 + - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL" MAKEFLAGS="HAVE_RULES=yes" SRCDIR=build VERIFY=1 matrix: # do notify immediately about it when a job of a build fails. @@ -31,7 +30,7 @@ before_install: script: # download clang git, compile cppcheck, run cppcheck on clang code to look for crashes in cppcheck. if this is done, terminate build - - if [[ "$CHECK_CLANG" == "yes" ]] && [[ "$CC" == "gcc" ]]; then wget "https://github.com/llvm-mirror/clang/archive/0ddd258c374240c22a53e3e71200048ec3a64284.zip" & make -j 4 & wait; unzip 0ddd258c374240c22a53e3e71200048ec3a64284.zip > /dev/null; touch /tmp/clang.cppcheck; cd ./clang-0ddd258c374240c22a53e3e71200048ec3a64284 ; ../cppcheck . --max-configs=1 --enable=all --inconclusive -iINPUTS -j 2 |& tee /tmp/clang.cppcheck; cd ../ ; ! grep "process crashed with signal" /tmp/clang.cppcheck; exit; fi + - if [[ "$CHECK_CLANG" == "yes" ]] && [[ "$CC" == "gcc" ]]; then wget "https://github.com/llvm-mirror/clang/archive/0ddd258c374240c22a53e3e71200048ec3a64284.zip" & make -j 4 & wait; unzip 0ddd258c374240c22a53e3e71200048ec3a64284.zip > /dev/null; touch /tmp/clang.cppcheck; cd ./clang-0ddd258c374240c22a53e3e71200048ec3a64284 ; ../cppcheck . --max-configs=1 --enable=all --inconclusive --exception-handling -iINPUTS -j 2 |& tee /tmp/clang.cppcheck; cd ../ ; ! grep "process crashed with signal" /tmp/clang.cppcheck; exit; fi # compile cppcheck, default build - make -j4 - make test -j4