Fix codecheck

gazebosim · Sep 6, 2019 · d9773e2 · d9773e2
1 parent 89f07ad
commit d9773e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/test/integration/ExamplesBuild_TEST.cc b/test/integration/ExamplesBuild_TEST.cc
@@ -89,7 +89,7 @@ bool createAndSwitchToTempDir(std::string &_newTempPath)
 #include <winioctl.h>  // NOLINT(build/include_order)
 #include <winnt.h>  // NOLINT(build/include_order)
 #include <cstdint>
-#include "win_dirent.h"
+#include "./win_dirent.h"
 
 /////////////////////////////////////////////////
 bool createAndSwitchToTempDir(std::string &_newTempPath)
@@ -307,7 +307,7 @@ bool isDirectory(const std::string &_path)
     return false;
   }
 
-  // cppcheck-suppress *
+  // cppcheck-suppress ConfigurationNotChecked
   return S_ISDIR(path_stat.st_mode);
 #else
   DWORD attr;

diff --git a/tools/code_check.sh b/tools/code_check.sh
@@ -53,7 +53,7 @@ else
     CPPCHECK_FILES=`find $CHECK_DIRS -name "*.cc" -o -name "*.hh"`
   fi
   CPPLINT_FILES=`\
-    find $CHECK_DIRS -name "*.cc" -o -name "*.hh" -o -name "*.c" -o -name "*.h"`
+    find $CHECK_DIRS -name "*.cc" -o -name "*.hh"`
 fi
 
 SUPPRESS=/tmp/cpp_check.suppress
@@ -68,7 +68,7 @@ rm $SUPPRESS
 touch $SUPPRESS
 
 #cppcheck
-CPPCHECK_BASE="cppcheck -q --suppressions-list=$SUPPRESS --inline-suppr"
+CPPCHECK_BASE="cppcheck --force -q --suppressions-list=$SUPPRESS --inline-suppr"
 if [ $CPPCHECK_LT_157 -eq 0 ]; then
   # use --language argument if 1.57 or greater (issue #907)
   CPPCHECK_BASE="$CPPCHECK_BASE --language=c++"