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

cppcheck.cpp: fix suppression of syntaxError (#1333) 

* cppcheck.cpp: fix suppression of syntaxError

* test: add supression test for syntaxError while file read
This commit is contained in:
Kevin Kendzia 2018-08-17 10:05:25 +02:00 committed by Daniel Marjamäki
parent bbf876256c
commit c5ebf26f9f
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cppcheck.cpp
View File

@ -174,8 +174,8 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
it->msg, it->msg,
"syntaxError", "syntaxError",
false); false);
mErrorLogger.reportErr(errmsg); reportErr(errmsg);
return 1; return mExitCode;
} }
} }

21
test/testsuppressions.cpp
View File

@ -58,7 +58,7 @@ private:
TEST_CASE(suppressionWithRelativePaths); // #4733 TEST_CASE(suppressionWithRelativePaths); // #4733
TEST_CASE(suppressingSyntaxErrors); // #7076 TEST_CASE(suppressingSyntaxErrors); // #7076
TEST_CASE(suppressingSyntaxErrorsInline); // #5917 TEST_CASE(suppressingSyntaxErrorsInline); // #5917
TEST_CASE(suppressingSyntaxErrorsWhileFileRead) // PR #1333
TEST_CASE(symbol); TEST_CASE(symbol);
TEST_CASE(unusedFunction); TEST_CASE(unusedFunction);
@ -523,6 +523,25 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void suppressingSyntaxErrorsWhileFileRead() { // syntaxError while file read should be suppressable (PR #1333)
std::map<std::string, std::string> files;
files["test.cpp"] = "CONST (genType, KS_CONST) genService[KS_CFG_NR_OF_NVM_BLOCKS] =\n"
"{\n"
"[!VAR \"BC\" = \"$BC + 1\"!][!//\n"
"[!IF \"(as:modconf('Ks')[1]/KsGeneral/KsType = 'KS_CFG_TYPE_KS_MASTER') and\n"
" (as:modconf('Ks')[1]/KsGeneral/KsUseShe = 'true')\"!][!//\n"
" {\n"
" &varNB_GetErrorStatus,\n"
" &varNB_WriteBlock,\n"
" &varNB_ReadBlock\n"
" },\n"
"[!VAR \"BC\" = \"$BC + 1\"!][!//\n"
"[!ENDIF!][!//\n"
"};";
checkSuppression(files, "syntaxError:test.cpp:4");
ASSERT_EQUALS("", errout.str());
}
void symbol() { void symbol() {
Suppressions::Suppression s; Suppressions::Suppression s;
s.errorId = "foo"; s.errorId = "foo";