From 3e58472cd3a9b522909c23d67f9c220cd84fd8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 14 Sep 2012 06:58:14 +0200
Subject: [PATCH] Fixed #4013 (Several test failures in testcmdlineparser.cpp)

---
 cli/cmdlineparser.cpp      | 4 ++++
 test/testcmdlineparser.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 8faffb1a8..74f68c9fc 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -362,6 +362,10 @@ 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
index 471940428..05fc18b2e 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -51,7 +51,7 @@ private:
         TEST_CASE(defines);
         TEST_CASE(defines2);
         TEST_CASE(defines3);
-        //TEST_CASE(defines4);
+        TEST_CASE(defines4);
         TEST_CASE(enforceLanguage);
         TEST_CASE(includesnopath);
         TEST_CASE(includes);