read cppcheck.cfg before the CLI options

Author: firewave

cli/cmdlineparser.cpp

@@ -321,22 +321,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     // default to --check-level=normal from CLI for now
     mSettings.setCheckLevel(Settings::CheckLevel::normal);
 
-    // TODO: this is duplicated in gui/mainwindows.cpp
-    {
-        // only read cppcheck.cfg if the product name has not been set yet
-        // this is hack so we can unit test this - should never happen in production
-        if (mSettings.cppcheckCfgProductName.empty())
-        {
-            // load config to determine if we are premium - do not apply any other settings
-            Settings s;
-            s.exename = mSettings.exename;
-            Suppressions supprs;
-            // TODO: errorhandling
-            Settings::loadCppcheckCfg(s, supprs, mSettings.debuglookup || mSettings.debuglookupConfig);
-            mSettings.cppcheckCfgProductName = s.cppcheckCfgProductName;
-        }
-        mSettings.premium = startsWith(mSettings.cppcheckCfgProductName, "Cppcheck Premium");
-    }
+    if (!loadCppcheckCfg())
+        return Result::Fail;
+
+    mSettings.premium = startsWith(mSettings.cppcheckCfgProductName, "Cppcheck Premium");
 
     if (argc <= 1) {
         printHelp(mSettings.premium);
@@ -363,8 +351,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
         // print all possible error messages..
         if (std::strcmp(argv[i], "--errorlist") == 0) {
-            if (!loadCppcheckCfg())
-                return Result::Fail;
             {
                 XMLErrorMessagesLogger xmlLogger;
                 std::cout << ErrorMessage::getXMLHeader(mSettings.cppcheckCfgProductName, 2);
@@ -388,8 +374,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
 
         if (std::strcmp(argv[i], "--version") == 0) {
-            if (!loadCppcheckCfg())
-                return Result::Fail;
             const std::string version = getVersion();
             mLogger.printRaw(version); // TODO: should not include newline
             return Result::Exit;
@@ -1563,9 +1547,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
     }
 
-    if (!loadCppcheckCfg())
-        return Result::Fail;
-
     // TODO: bail out?
     if (!executorAuto && mSettings.useSingleJob())
         mLogger.printMessage("'--executor' has no effect as only a single job will be used.");

gui/mainwindow.cpp

@@ -131,7 +131,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mSelectLanguageActions(new QActionGroup(this)),
     mSelectReportActions(new QActionGroup(this))
 {
-    // TODO: this is duplicated in cli/cmdlineparser.cpp
     {
         Settings tempSettings;
         tempSettings.exename = QCoreApplication::applicationFilePath().toStdString();

test/cli/other_test.py

@@ -1744,7 +1744,7 @@ def test_config_override(tmpdir):
     exitcode, stdout, stderr, exe = cppcheck_ex(['-q', '--safety', test_file], cwd=tmpdir, cppcheck_exe=exe, remove_checkers_report=False)
     assert exitcode == 0, stdout if stdout else stderr
     assert stdout.splitlines() == []
-    assert stderr.splitlines() == []
+    assert 'checkersReport' in stderr
 
 
 def test_checkers_report(tmpdir):