From d8997bb43ff0873f60392f1727d9564c91311231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 5 Aug 2018 14:01:24 +0200 Subject: [PATCH] Fix testrunner --- test/testcmdlineparser.cpp | 10 +++++----- test/testmemleak.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp index fd73ea2f0..c84921307 100644 --- a/test/testcmdlineparser.cpp +++ b/test/testcmdlineparser.cpp @@ -52,7 +52,7 @@ private: TEST_CASE(optionwithoutfile); TEST_CASE(verboseshort); TEST_CASE(verboselong); - TEST_CASE(debug); + TEST_CASE(debugSimplified); TEST_CASE(debugwarnings); TEST_CASE(forceshort); TEST_CASE(forcelong); @@ -224,12 +224,12 @@ private: ASSERT_EQUALS(true, settings.verbose); } - void debug() { + void debugSimplified() { REDIRECT; - const char *argv[] = {"cppcheck", "--debug", "file.cpp"}; - settings.debug = false; + const char *argv[] = {"cppcheck", "--debug-simplified", "file.cpp"}; + settings.debugSimplified = false; ASSERT(defParser.parseFromArgs(3, argv)); - ASSERT_EQUALS(true, settings.debug); + ASSERT_EQUALS(true, settings.debugSimplified); } void debugwarnings() { diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp index 79567da46..bbd30a214 100644 --- a/test/testmemleak.cpp +++ b/test/testmemleak.cpp @@ -846,7 +846,7 @@ private: // Clear the error buffer.. errout.str(""); - settings0.debug = settings0.debugwarnings = true; + settings0.debugwarnings = true; // Tokenize.. std::istringstream istr(code); @@ -873,7 +873,7 @@ private: const Token *tok = CheckMemoryLeakInFunction::findleak(tokens); - settings0.debug = settings0.debugwarnings = false; + settings0.debugwarnings = false; return (tok ? tok->linenr() : (unsigned int)(-1)); }