travis: refactor config, spawn llvm, clang and dmake jobs directly and remove env var hacks. (#1565)

* travis: refactor config, spawn llvm, clang and dmake jobs directly and remove env var hacks. * travis: make sure cxxflags of travis match those in the makefile * travis: move tests that run independant of CXXFLAGS into their own job
2019-01-09 09:54:46 +01:00 · 2019-01-09 09:54:46 +01:00 · 63d9144f60
parent 0985b506f1
commit 63d9144f60
1 changed files with 106 additions and 87 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -7,76 +7,26 @@ compiler:

 env:
  global:
+    - ORIGINAL_CXXFLAGS="-pedantic -Wall -Wextra -Wabi -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wshadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar -D_GLIBCXX_DEBUG -g "
 #   unfortunately we need this to stay within 50min timelimit given by travis.
-#   this also turns off the debug/warning cxxflags
-    - ORIGINAL_CXXFLAGS="-pedantic -Wall -Wextra -Wabi -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar -D_GLIBCXX_DEBUG -g "
    - CXXFLAGS="${ORIGINAL_CXXFLAGS} -O2 -march=native -Wstrict-aliasing=2 -Werror=strict-aliasing"
    - CPPCHECK=${TRAVIS_BUILD_DIR}/cppcheck
  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
    - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL"
    - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL" MAKEFLAGS="HAVE_RULES=yes" SRCDIR=build VERIFY=1
-    - SRCDIR=build CHECK_CLANG=yes VERIFY=1
-    - SRCDIR=build CHECK_LLVM=yes VERIFY=1
-    - CHECK_MAKEFILE_REGEN=true

 matrix:
 # do notify immediately about it when a job of a build fails.
  fast_finish: true
-# exclude clang checking with clang binary, not needed
-  exclude:
-    - compiler: gcc
-      env: SRCDIR=build CHECK_CLANG=yes VERIFY=1
-    - compiler: gcc
-      env: SRCDIR=build CHECK_LLVM=yes VERIFY=1
-    - compiler: gcc
-      env: CHECK_MAKEFILE_REGEN=true
  allow_failures:
-    - compiler: clang
-      env: CHECK_MAKEFILE_REGEN=true
-
-before_install:
-# install needed deps
- - sudo apt-get update -qq
- - sudo apt-get install -qq python-pygments qt5-default qt5-qmake qtbase5-dev qtcreator libxml2-utils libpcre3 gdb unzip wx-common xmlstarlet
-
+    - name: "rerun dmake?"
+      compiler: clang
+  include:
+# check a lot of stuff that only needs to be checked in a single configuration
+    - name: "misc"
+      compiler: clang
      script:
-# fail the entire job as soon as one of the subcommands exits non-zero to save time and resources
-  - set -e
-# Determine CPU count. As of January 2019 it seems to be 2 - so use this for job count in suitable calls to make or cppcheck
-  - cat /proc/cpuinfo
-# 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" == "clang" ]]; then wget "https://github.com/llvm-mirror/clang/archive/a1f8bd3778cc5a53236a53500c6ab184e945eefa.zip" & make -j 2 & wait; unzip a1f8bd3778cc5a53236a53500c6ab184e945eefa.zip > /dev/null; touch /tmp/clang.cppcheck; cd ./clang-a1f8bd3778cc5a53236a53500c6ab184e945eefa ; ${CPPCHECK} . --max-configs=1 --enable=all --inconclusive --exception-handling --template="{callstack} ({severity}) {message} [{id}]" -iINPUTS -itest/Driver/Inputs/gen-response.c -itest/Index/index-many-logical-ops.c -itest/Sema/many-logical-ops.c --suppressions-list=../.travis_llvmcheck_suppressions -j 2 |& grep -v ".* files checked.*done" |& tee /tmp/clang.cppcheck; cd ../ ; echo "CLANG" ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/clang.cppcheck; exit; fi
-# check llvm as well
-  - if [[  "$CHECK_LLVM" == "yes" ]] && [[ "$CC" == "clang" ]]; then wget "https://github.com/llvm-mirror/llvm/archive/6fa6453210fa34c1c28bd73a431d04734549f0d6.zip"  & make -j 2 & wait; unzip 6fa6453210fa34c1c28bd73a431d04734549f0d6.zip > /dev/null;  touch /tmp/llvm.cppcheck;  cd ./llvm-6fa6453210fa34c1c28bd73a431d04734549f0d6 ; ${CPPCHECK} . --max-configs=1 --enable=all --inconclusive --exception-handling --template="{callstack} ({severity}) {message} [{id}]" --suppressions-list=../.travis_llvmcheck_suppressions -j 2 |& grep -v ".* files checked.*done" |& tee /tmp/llvm.cppcheck; cd ../ ; echo "LLVM"  ; ! grep "process crashed with signal\|Internal error\. compiled" /tmp/llvm.cppcheck; exit; fi
-# check if dmake needs to be rerun but if yes, don't fail the build but notify us.
-# to update dmake: "make dmake; ./dmake; and commit
-  - echo "If the following command fails, run 'make dmake; make run-dmake' and commit the resulting change."
-  - if [[ "$CHECK_MAKEFILE_REGEN" == "true" ]]; then make -s dmake; make -s run-dmake ; git diff --exit-code; exit; fi
-# check with TEST_MATHLIB_VALUE enabled
-  - touch lib/mathlib.cpp test/testmathlib.cpp
-  - echo $CXXFLAGS
-  - make -s test -j2 CPPFLAGS=-DTEST_MATHLIB_VALUE
-  - touch lib/mathlib.cpp test/testmathlib.cpp
-# compile cppcheck, default build
-  - echo $CXXFLAGS
-  - make -s test -j2
-# compile gui
-  - cd gui
-  - qmake
-  - echo $CXXFLAGS
-  - make -s -j2
-# building gui generates some more files that cppcheck can check, so check the repo *after* building gui
-  - 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 --library=cppcheck-lib -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 --suppressions-list=.travis_suppressions -igui/test |& tee --append /tmp/cppcheck.cppcheck
-  - sh -c "! grep '^\[' /tmp/cppcheck.cppcheck"
-# check naming conventions
-  - ${CPPCHECK} -i gui/test -j 2 --dump -q gui lib
-  - find lib gui -maxdepth 1 -name "*.dump" | xargs -n 1 -P 4 python addons/naming.py --private-member-variable='m[A-Z].*'
+        - make -j 2
 # run extra tests
        - tools/generate_and_run_more_tests.sh
 # check for missing CWE entries
@ -87,15 +37,6 @@ script:
        - make validatePlatforms
 # Validate Result XML
        - make validateXML
-# Build gui
-  - cd ./gui
-# clean rebuild
-  - git clean -dfx .
-# can't set this as env flags, so try again with HAVE_RULES=yes
-  - qmake HAVE_RULES=yes
-  - echo $CXXFLAGS
-  - make -s -j2
-  - cd ../
 # note: trusty on travis has python pygments disabled so disable these tests on travis
 ## check htmlreport stuff
 #  - ./htmlreport/test_htmlreport.py
@ -150,6 +91,84 @@ script:
        - cmake -G "Unix Makefiles" ..
        - cd ..

+# check clang sources with cppcheck and look for crashes
+    - name: "check clang sources with cppcheck"
+      compiler: clang
+      script:
+        - wget "https://github.com/llvm-mirror/clang/archive/a1f8bd3778cc5a53236a53500c6ab184e945eefa.zip" & SRCDIR=build VERIFY=1 make -j 2 & wait
+        - unzip a1f8bd3778cc5a53236a53500c6ab184e945eefa.zip > /dev/null
+        - touch /tmp/clang.cppcheck
+        - cd ./clang-a1f8bd3778cc5a53236a53500c6ab184e945eefa
+        - ${CPPCHECK} . --max-configs=1 --enable=all --inconclusive --exception-handling --template="{callstack} ({severity}) {message} [{id}]" -iINPUTS -itest/Driver/Inputs/gen-response.c -itest/Index/index-many-logical-ops.c -itest/Sema/many-logical-ops.c --suppressions-list=../.travis_llvmcheck_suppressions -j 2 |& grep -v ".* files checked.*done" |& tee /tmp/clang.cppcheck
+        - cd ../
+        - echo "CLANG"
+        - grep "process crashed with signal\|Internal error\. compiled" /tmp/clang.cppcheck || true
+        - grep -qv "process crashed with signal\|Internal error\. compiled" /tmp/clang.cppcheck
+# check llvm sources with cppcheck and look for crashes
+    - name: "check llvm sources with cppcheck"
+      compiler: clang
+      script:
+        - wget "https://github.com/llvm-mirror/llvm/archive/6fa6453210fa34c1c28bd73a431d04734549f0d6.zip"  & SRCDIR=build VERIFY=1 make -j 2 & wait
+        - unzip 6fa6453210fa34c1c28bd73a431d04734549f0d6.zip > /dev/null
+        - touch /tmp/llvm.cppcheck
+        - cd ./llvm-6fa6453210fa34c1c28bd73a431d04734549f0d6
+        - ${CPPCHECK} . --max-configs=1 --enable=all --inconclusive --exception-handling --template="{callstack} ({severity}) {message} [{id}]" --suppressions-list=../.travis_llvmcheck_suppressions -j 2 |& grep -v ".* files checked.*done" |& tee /tmp/llvm.cppcheck
+        - cd ../
+        - echo "LLVM"
+        - grep "process crashed with signal\|Internal error\. compiled" /tmp/llvm.cppcheck || true
+        - grep -qv "process crashed with signal\|Internal error\. compiled" /tmp/llvm.cppcheck
+# check if dmake needs to be rerun (this job may fail)
+    - name: "rerun dmake?"
+      compiler: clang
+      script:
+        - echo "If the following command fails, run 'make dmake; make run-dmake' and commit the resulting change."
+        - make -s dmake
+        - make -s run-dmake
+        - git diff --exit-code
+before_install:
+# install needed deps
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq python-pygments qt5-default qt5-qmake qtbase5-dev qtcreator libxml2-utils libpcre3 gdb unzip wx-common xmlstarlet
+
+script:
+# fail the entire job as soon as one of the subcommands exits non-zero to save time and resources
+  - set -e
+# Determine CPU count. As of January 2019 it seems to be 2 - so use this for job count in suitable calls to make or cppcheck
+  - cat /proc/cpuinfo
+# check with TEST_MATHLIB_VALUE enabled
+  - touch lib/mathlib.cpp test/testmathlib.cpp
+  - echo $CXXFLAGS
+  - make -s test -j2 CPPFLAGS=-DTEST_MATHLIB_VALUE
+  - touch lib/mathlib.cpp test/testmathlib.cpp
+# compile cppcheck, default build
+  - echo $CXXFLAGS
+  - make -s test -j2
+# compile gui
+  - cd gui
+  - qmake
+  - echo $CXXFLAGS
+  - make -s -j2
+# building gui generates some more files that cppcheck can check, so check the repo *after* building gui
+  - 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 --library=cppcheck-lib -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 --suppressions-list=.travis_suppressions -igui/test |& tee --append /tmp/cppcheck.cppcheck
+  - sh -c "! grep '^\[' /tmp/cppcheck.cppcheck"
+# check naming conventions
+  - ${CPPCHECK} -i gui/test -j 2 --dump -q gui lib
+  - find lib gui -maxdepth 1 -name "*.dump" | xargs -n 1 -P 4 python addons/naming.py --private-member-variable='m[A-Z].*'
+# Build gui
+  - cd ./gui
+# clean rebuild
+  - git clean -dfx .
+# can't set this as env flags, so try again with HAVE_RULES=yes
+  - qmake HAVE_RULES=yes
+  - echo $CXXFLAGS
+  - make -s -j2
+  - cd ../
+
 notifications:
  irc:
    channels: