Fixed danmar#5137 (Defining empty macro from commandline does not seem to work)

danmar · danmar · commit 8910bae801bd · 2013-11-03T09:46:03.000+01:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -377,10 +377,6 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             if (define.find("=") == std::string::npos)
                 define += "=1";
 
-            // DEF= => empty define
-            else if (define.find("=") + 1U == define.size())
-                define.erase(define.size() - 1U);
-
             if (!_settings->userDefines.empty())
                 _settings->userDefines += ";";
             _settings->userDefines += define;
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -346,10 +346,10 @@ class TestCmdlineParser : public TestFixture {
 
     void defines4() {
         REDIRECT;
-        const char *argv[] = {"cppcheck", "-DDEBUG=", "file.cpp"};
+        const char *argv[] = {"cppcheck", "-DDEBUG=", "file.cpp"}; // #5137 - defining empty macro
         settings.userDefines.clear();
         ASSERT(defParser.ParseFromArgs(3, argv));
-        ASSERT_EQUALS("DEBUG", settings.userDefines);
+        ASSERT_EQUALS("DEBUG=", settings.userDefines);
     }
 
     void enforceLanguage() {
