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

Fix testrunner

This commit is contained in:
Daniel Marjamäki 2018-08-05 14:01:24 +02:00
parent ddbe4b89b5
commit d8997bb43f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/testcmdlineparser.cpp
View File

@ -52,7 +52,7 @@ private:
TEST_CASE(optionwithoutfile); TEST_CASE(optionwithoutfile);
TEST_CASE(verboseshort); TEST_CASE(verboseshort);
TEST_CASE(verboselong); TEST_CASE(verboselong);
TEST_CASE(debug); TEST_CASE(debugSimplified);
TEST_CASE(debugwarnings); TEST_CASE(debugwarnings);
TEST_CASE(forceshort); TEST_CASE(forceshort);
TEST_CASE(forcelong); TEST_CASE(forcelong);
@ -224,12 +224,12 @@ private:
ASSERT_EQUALS(true, settings.verbose); ASSERT_EQUALS(true, settings.verbose);
} }
void debug() { void debugSimplified() {
REDIRECT; REDIRECT;
const char *argv[] = {"cppcheck", "--debug", "file.cpp"}; const char *argv[] = {"cppcheck", "--debug-simplified", "file.cpp"};
settings.debug = false; settings.debugSimplified = false;
ASSERT(defParser.parseFromArgs(3, argv)); ASSERT(defParser.parseFromArgs(3, argv));
ASSERT_EQUALS(true, settings.debug); ASSERT_EQUALS(true, settings.debugSimplified);
} }
void debugwarnings() { void debugwarnings() {

4
test/testmemleak.cpp
View File

@ -846,7 +846,7 @@ private:
// Clear the error buffer.. // Clear the error buffer..
errout.str(""); errout.str("");
settings0.debug = settings0.debugwarnings = true; settings0.debugwarnings = true;
// Tokenize.. // Tokenize..
std::istringstream istr(code); std::istringstream istr(code);
@ -873,7 +873,7 @@ private:
const Token *tok = CheckMemoryLeakInFunction::findleak(tokens); const Token *tok = CheckMemoryLeakInFunction::findleak(tokens);
settings0.debug = settings0.debugwarnings = false; settings0.debugwarnings = false;
return (tok ? tok->linenr() : (unsigned int)(-1)); return (tok ? tok->linenr() : (unsigned int)(-1));
} }