From 8d482f5fcddd826e8540ba527bff2f554a393265 Mon Sep 17 00:00:00 2001
From: Matej Ferencevic <matej.ferencevic@memgraph.io>
Date: Sun, 30 Jul 2017 12:15:29 +0200
Subject: [PATCH] Fixed apollo cppcheck run.
Reviewers: mislav.bradac
Reviewed By: mislav.bradac
Subscribers: pullbot
Differential Revision: https://phabricator.memgraph.io/D610
---
tools/apollo/cppcheck | 4 ++--
tools/apollo/generate | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/apollo/cppcheck b/tools/apollo/cppcheck
index e61d63ed6..4f504bb13 100755
--- a/tools/apollo/cppcheck
+++ b/tools/apollo/cppcheck
@@ -16,9 +16,9 @@ if [ "$mode" == diff ]; then
flags=""
else
files=src/
- flags="-j$THREADS"
+ flags="-j$THREADS -Isrc"
fi
-cppcheck --enable=all --force --suppress=missingInclude $flags -Isrc $files 2>"$errfile"
+cppcheck --enable=all --force --suppress=missingInclude $flags $files 2>"$errfile"
cat "$errfile" >&2
diff --git a/tools/apollo/generate b/tools/apollo/generate
index 547f8a743..e3c1f33de 100755
--- a/tools/apollo/generate
+++ b/tools/apollo/generate
@@ -105,7 +105,7 @@ check_dirs = list(map(lambda x: os.path.join(BASE_DIR, x), ["src", "tests",
archive = create_archive("cppcheck", check_dirs, WORKSPACE_DIR)
cmd = os.path.relpath(cppcheck, WORKSPACE_DIR)
outfile_paths = "\./" + cmd.replace("cppcheck", ".cppcheck_errors").replace(".", "\\.")
-RUNS.append(generate_run("cppcheck", commands = './{} {}'.format(cmd, mode),
+RUNS.append(generate_run("cppcheck", commands = 'TIMEOUT=1000 ./{} {}'.format(cmd, mode),
infile = archive, outfile_paths = outfile_paths))
# ctest tests