From 841df2a6afe8eb25c14d808c31d2871019986f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Mon, 17 Mar 2014 19:47:23 +0100 Subject: [PATCH 1/2] travis: allow failure of the kernel job. It sometimes times out when travis is on heavy load (which is a false positive). --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3e31f84d9..0ca5447df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,9 @@ matrix: exclude: - compiler: clang env: CXXFLAGS="-O3 -march=native -mtune=native" SRCDIR=build CHECK_KERNEL=yes +# kernel check can time out during travis rush hour, so make failure of it less grave... + allow_failures: + - env: CXXFLAGS="-O3 -march=native -mtune=native" SRCDIR=build CHECK_KERNEL=yes before_install: # install needed deps From 24e187277211839bb8cce6b725e3b28a0f04a495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Tue, 18 Mar 2014 01:58:43 +0100 Subject: [PATCH 2/2] travis: apply the same hack I used to work around broken exit status and kernel checking to cppcheck checking its own code (use -j2). Speeds up by around 3-4 minutes per affected job. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ca5447df..59ef0053a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,10 @@ script: - make -j4 # building gui generates some more files that cppcheck can check, so check the repo *after* building gui - cd ../ - - ./cppcheck --error-exitcode=1 -Ilib --enable=style --suppressions-list=.travis_suppressions . +# use same hack as for kernel 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 --enable=style --suppressions-list=.travis_suppressions . -j 2 |& tee /tmp/cppcheck.cppcheck + - sh -c "! grep "^\[" /tmp/cppcheck.cppcheck" - cd ./gui # clean rebuild - git clean -dfx .