walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #5746 (Cppcheck returns error-exitcode when globally suppressed error is encounted when running with multiple jobs.)

This commit is contained in:
Daniel Marjamäki 2016-05-27 20:13:51 +02:00
parent 00e4f70fe3
commit cee67730b1
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cppcheck.cpp
View File

@ -586,7 +586,7 @@ void CppCheck::reportErr(const ErrorLogger::ErrorMessage &msg)
return; return;
} }
if (!_settings.nofail.isSuppressed(msg._id, file, line)) if (!_settings.nofail.isSuppressed(msg._id, file, line) && !_settings.nomsg.isSuppressed(msg._id, file, line))
exitcode = 1; exitcode = 1;
_errorList.push_back(errmsg); _errorList.push_back(errmsg);

31
test/testsuppressions.cpp
View File

@ -131,15 +131,15 @@ private:
} }
// Check the suppression // Check the suppression
void checkSuppression(const char code[], const std::string &suppression = emptyString) { unsigned int checkSuppression(const char code[], const std::string &suppression = emptyString) {
std::map<std::string, std::string> files; std::map<std::string, std::string> files;
files["test.cpp"] = code; files["test.cpp"] = code;
checkSuppression(files, suppression); return checkSuppression(files, suppression);
} }
// Check the suppression for multiple files // Check the suppression for multiple files
void checkSuppression(std::map<std::string, std::string> &files, const std::string &suppression = emptyString) { unsigned int checkSuppression(std::map<std::string, std::string> &files, const std::string &suppression = emptyString) {
// Clear the error log // Clear the error log
errout.str(""); errout.str("");
@ -153,15 +153,18 @@ private:
ASSERT_EQUALS("", r); ASSERT_EQUALS("", r);
} }
unsigned int exitCode = 0;
for (std::map<std::string, std::string>::const_iterator file = files.begin(); file != files.end(); ++file) { for (std::map<std::string, std::string>::const_iterator file = files.begin(); file != files.end(); ++file) {
cppCheck.check(file->first, file->second); exitCode |= cppCheck.check(file->first, file->second);
} }
cppCheck.analyseWholeProgram(); cppCheck.analyseWholeProgram();
reportSuppressions(settings, files); reportSuppressions(settings, files);
return exitCode;
} }
void checkSuppressionThreads(const char code[], const std::string &suppression = emptyString) { unsigned int checkSuppressionThreads(const char code[], const std::string &suppression = emptyString) {
errout.str(""); errout.str("");
output.str(""); output.str("");
@ -179,16 +182,18 @@ private:
for (std::map<std::string, std::size_t>::const_iterator i = files.begin(); i != files.end(); ++i) for (std::map<std::string, std::size_t>::const_iterator i = files.begin(); i != files.end(); ++i)
executor.addFileContent(i->first, code); executor.addFileContent(i->first, code);
executor.check(); unsigned int exitCode = executor.check();
std::map<std::string, std::string> files_for_report; std::map<std::string, std::string> files_for_report;
for (std::map<std::string, std::size_t>::const_iterator file = files.begin(); file != files.end(); ++file) for (std::map<std::string, std::size_t>::const_iterator file = files.begin(); file != files.end(); ++file)
files_for_report[file->first] = ""; files_for_report[file->first] = "";
reportSuppressions(settings, files_for_report); reportSuppressions(settings, files_for_report);
return exitCode;
} }
void runChecks(void (TestSuppressions::*check)(const char[], const std::string &)) { void runChecks(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
// check to make sure the appropriate error is present // check to make sure the appropriate error is present
(this->*check)("void f() {\n" (this->*check)("void f() {\n"
" int a;\n" " int a;\n"
@ -319,6 +324,18 @@ private:
"}\n", "}\n",
""); "");
ASSERT_EQUALS("[test.cpp:4]: (information) Unmatched suppression: uninitvar\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (information) Unmatched suppression: uninitvar\n", errout.str());
// #5746 - exitcode
ASSERT_EQUALS(1U,
(this->*check)("int f() {\n"
" int a; return a;\n"
"}\n",
""));
ASSERT_EQUALS(0U,
(this->*check)("int f() {\n"
" int a; return a;\n"
"}\n",
"uninitvar"));
} }
void suppressionsSettings() { void suppressionsSettings() {