Travis CI: Execute cppcheck without sudo and -U long

diff --git a/.travis.yml b/.travis.yml
index 9240116602206c8d858de74b153fcf5afe899cce..e97b3fa16fd4956484ba7afb46acda071733e466 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -254,12 +254,10 @@ matrix:
     env:
     - CPPCHECK_ENABLE="-j16 -q --enable=information,performance,portability,style,warning"
     - MAKEFILE_TARGET=all
-    sudo: required
   - os: linux
     env:
     - CPPCHECK_ENABLE="-q --enable=unusedFunction -D AO_TEST_EMULATION"
     - MAKEFILE_TARGET=all
-    sudo: required
   - os: linux
     addons:
       apt:
@@ -552,8 +550,9 @@ matrix:
 
 before_install:
 - if [[ "$CPPCHECK_ENABLE" != "" ]]; then
+    CPPCHECK_VER=master;
     git clone --depth=3 https://github.com/danmar/cppcheck.git
-              ~/cppcheck -b master;
+            ~/cppcheck -b $CPPCHECK_VER;
     make --directory ~/cppcheck -j CXXFLAGS="-O3 -march=native -D NDEBUG";
   fi
 - if [[ "$CROSS_GCC_VER" != "" ]]; then
@@ -620,7 +619,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/cppcheck -f --error-exitcode=2 -D CPPCHECK -I src
                         $CPPCHECK_ENABLE tests/*.c src/*.c;
   fi
 - if [[ "$TESTS_CUSTOM_RUN" == true ]]; then