travis: slightly simplify travis.yml

This commit is contained in:
Matthias Krüger 2015-07-31 15:33:27 +02:00
parent 73eefa46fc
commit 7422366ebc
1 changed files with 3 additions and 4 deletions

View File

@ -31,11 +31,10 @@ before_install:
script: script:
# download clang git, compile cppcheck, run cppcheck on clang code to look for crashes in cppcheck. if this is done, terminate build # 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/817ee21333dffb3c77ef845aa1a9f8d1dc94a842.zip" & make -j 4 & wait; unzip 817ee21333dffb3c77ef845aa1a9f8d1dc94a842.zip > /dev/null; touch /tmp/clang.cppcheck; cd ./clang-817ee21333dffb3c77ef845aa1a9f8d1dc94a842 ; ../cppcheck . --max-configs=1 --enable=all --inconclusive --exception-handling -iINPUTS -j 2 |& tee /tmp/clang.cppcheck; cd ../ ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/clang.cppcheck; exit; fi - if [[ "$CHECK_CLANG" == "yes" ]] && [[ "$CC" == "gcc" ]]; then wget "https://github.com/llvm-mirror/clang/archive/817ee21333dffb3c77ef845aa1a9f8d1dc94a842.zip" & make -j 4 & wait; unzip 817ee21333dffb3c77ef845aa1a9f8d1dc94a842.zip > /dev/null; touch /tmp/clang.cppcheck; cd ./clang-817ee21333dffb3c77ef845aa1a9f8d1dc94a842 ; ../cppcheck . --max-configs=1 --enable=all --inconclusive --exception-handling -iINPUTS -j 2 |& tee /tmp/clang.cppcheck; cd ../ ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/clang.cppcheck; exit; fi
# compile cppcheck, default build # check with TEST_MATHLIB_VALUE enabled
- make clean
- make test -j4 CPPFLAGS=-DTEST_MATHLIB_VALUE - make test -j4 CPPFLAGS=-DTEST_MATHLIB_VALUE
- touch lib/mathlib.cpp # compile cppcheck, default build
- touch test/testmathlib.cpp - touch lib/mathlib.cpp test/testmathlib.cpp
- make test -j4 - make test -j4
# compile gui # compile gui
- cd gui - cd gui