Travis CI: Use Ubuntu packaged cppcheck for a release branch

diff --git a/.travis.yml b/.travis.yml
index 79a648f7d4c139e0c0c69dc0f8e0c1fed7497ec4..d9d7232f511f0595b887fed6e9809f2ae7172f06 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -239,15 +239,21 @@ matrix:
     - REPORT_COVERAGE=true
     - CFLAGS_EXTRA="-march=native -D DEBUG_RUN_ONE_TEST -D VERBOSE"
   - os: linux
+    addons:
+      apt:
+        packages:
+        - cppcheck
     env:
     - CPPCHECK_ENABLE="-j16 -q --enable=information,performance,portability,style,warning"
     - MAKEFILE_TARGET=all
-    sudo: required
   - os: linux
+    addons:
+      apt:
+        packages:
+        - cppcheck
     env:
     - CPPCHECK_ENABLE="-q --enable=unusedFunction -D AO_TEST_EMULATION"
     - MAKEFILE_TARGET=all
-    sudo: required
   - os: linux
     addons:
       apt:
@@ -462,11 +468,6 @@ matrix:
     - NOLIBC_ARCH_ABI=tilegx-linux
 
 before_install:
-- if [[ "$CPPCHECK_ENABLE" != "" ]]; then
-    git clone --depth=3 https://github.com/danmar/cppcheck.git
-              ~/cppcheck -b master;
-    make --directory ~/cppcheck -j CXXFLAGS="-O3 -march=native -D NDEBUG";
-  fi
 - if [[ "$CROSS_GCC_VER" != "" ]]; then
     BUILD_ARCH=x86_64;
     TAR_FOLDER_URL=https://www.kernel.org/pub/tools/crosstool/files/bin/$BUILD_ARCH/$CROSS_GCC_VER;
@@ -525,7 +526,7 @@ script:
           $CFLAGS_EXTRA tests/*.c src/*.c;
   fi
 - if [[ "$CPPCHECK_ENABLE" != "" ]]; then
-    ~/cppcheck/cppcheck -f --error-exitcode=2 -U long -D CPPCHECK -I src
+    cppcheck -f --error-exitcode=2 -D CPPCHECK -I src
                         $CPPCHECK_ENABLE tests/*.c src/*.c;
   fi
 - if [[ "$TESTS_CUSTOM_RUN" == true ]]; then