From 7422366ebcf39a645e285d90e5433f1d1f593847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Fri, 31 Jul 2015 15:33:27 +0200 Subject: [PATCH] travis: slightly simplify travis.yml --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4a06f0bd..eac839f6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,11 +31,10 @@ 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/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 - - make clean +# check with TEST_MATHLIB_VALUE enabled - make test -j4 CPPFLAGS=-DTEST_MATHLIB_VALUE - - touch lib/mathlib.cpp - - touch test/testmathlib.cpp +# compile cppcheck, default build + - touch lib/mathlib.cpp test/testmathlib.cpp - make test -j4 # compile gui - cd gui