From eaaf6268a99ea8873b340daa56e048ee5fdc1e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 22 Apr 2017 21:28:58 +0200 Subject: [PATCH] travis: make gui check the same as normal check but with qt settings and don't check gui twice. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c95ce0953..254b35ac9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,6 @@ script: - touch lib/mathlib.cpp test/testmathlib.cpp # compile cppcheck, default build - make test -j4 -# analyse gui code - - ./cppcheck --library=qt --enable=style gui/*.cpp # compile gui - cd gui - qmake @@ -53,7 +51,9 @@ script: - cd ../ # use same hack as for clang to work around cppchecks broken exit status with -j 2 ; create file, tee everything to the file and stdout, grep for errors in the file - touch /tmp/cppcheck.cppcheck - - ./cppcheck --error-exitcode=1 -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --enable=style,performance,portability,warning,internal --exception-handling --suppressions-list=.travis_suppressions -itest/synthetic -iaddons . -j 2 |& tee /tmp/cppcheck.cppcheck + - ./cppcheck --error-exitcode=1 -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --enable=style,performance,portability,warning,internal --exception-handling --suppressions-list=.travis_suppressions -itest/synthetic -iaddons -igui . -j 2 |& tee /tmp/cppcheck.cppcheck +# check gui with qt settings + - ./cppcheck --library=qt --error-exitcode=1 -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --enable=style,performance,portability,warning,internal --exception-handling -j 2 gui -igui/test |& tee --append /tmp/cppcheck.cppcheck - sh -c "! grep '^\[' /tmp/cppcheck.cppcheck" # run extra tests - tools/generate_and_run_more_tests.sh