fetch addon infos only once and store them in Settings::addonInfos

Author: firewave

Makefile

@@ -150,6 +150,9 @@ bool CppCheckExecutor::parseFromArgs(Settings &settings, int argc, const char* c
     if (!loadLibraries(settings))
         return false;
 
+    if (!loadAddons(settings))
+        return false;
+
     // Check that all include paths exist
     {
         for (std::list<std::string>::iterator iter = settings.includePaths.begin();
@@ -406,6 +409,20 @@ bool CppCheckExecutor::loadLibraries(Settings& settings)
     return result;
 }
 
+bool CppCheckExecutor::loadAddons(Settings& settings)
+{
+    for (const std::string &addon: settings.addons) {
+        AddonInfo addonInfo;
+        const std::string failedToGetAddonInfo = addonInfo.getAddonInfo(addon, settings.exename);
+        if (!failedToGetAddonInfo.empty()) {
+            std::cout << failedToGetAddonInfo << std::endl;
+            return false;
+        }
+        settings.addonInfos.emplace_back(std::move(addonInfo));
+    }
+    return true;
+}
+
 #ifdef _WIN32
 // fix trac ticket #439 'Cppcheck reports wrong filename for filenames containing 8-bit ASCII'
 static inline std::string ansiToOEM(const std::string &msg, bool doConvert)

cli/cppcheckexecutor.cpp

@@ -153,6 +153,13 @@ class CppCheckExecutor : public ErrorLogger {
      */
     bool loadLibraries(Settings& settings);
 
+    /**
+     * @brief Load addons
+     * @param settings Settings
+     * @return Returns true if successful
+     */
+    bool loadAddons(Settings& settings);
+
     /**
      * @brief Write the checkers report
      */

cli/cppcheckexecutor.h

@@ -999,6 +999,7 @@ Settings MainWindow::getCppcheckSettings()
 
             addonFilePath.replace(QChar('\\'), QChar('/'));
 
+            // TODO: use picojson to generate the JSON
             QString json;
             json += "{ \"script\":\"" + addonFilePath + "\"";
             if (!pythonCmd.isEmpty())
@@ -1014,6 +1015,9 @@ Settings MainWindow::getCppcheckSettings()
             }
             json += " }";
             result.addons.emplace(json.toStdString());
+            AddonInfo addonInfo;
+            addonInfo.getAddonInfo(json.toStdString(), result.exename);
+            result.addonInfos.emplace_back(std::move(addonInfo));
         }
 
         if (isCppcheckPremium()) {

gui/mainwindow.cpp

@@ -1367,14 +1367,10 @@ void CppCheck::executeAddons(const std::vector<std::string>& files)
             fout << f << std::endl;
     }
 
-    for (const std::string &addon : mSettings.addons) {
-        struct AddonInfo addonInfo;
-        const std::string &failedToGetAddonInfo = addonInfo.getAddonInfo(addon, mSettings.exename);
-        if (!failedToGetAddonInfo.empty()) {
-            reportOut(failedToGetAddonInfo, Color::FgRed);
-            mExitCode = 1;
-            continue;
-        }
+    // ensure all addons have already been resolved - TODO: remove when settings are const after creation
+    assert(mSettings.addonInfos.size() == mSettings.addons.size());
+
+    for (const AddonInfo &addonInfo : mSettings.addonInfos) {
         if (addonInfo.name != "misra" && !addonInfo.ctu && endsWith(files.back(), ".ctu-info"))
             continue;
 

lib/cppcheck.cpp

@@ -21,6 +21,7 @@
 #define settingsH
 //---------------------------------------------------------------------------
 
+#include "addoninfo.h"
 #include "config.h"
 #include "errortypes.h"
 #include "importproject.h"
@@ -104,6 +105,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief addons, either filename of python/json file or json data */
     std::unordered_set<std::string> addons;
 
+    /** @brief the loaded addons infos */
+    std::vector<AddonInfo> addonInfos;
+
     /** @brief Path to the python interpreter to be used to run addons. */
     std::string addonPython;
 

lib/settings.h

@@ -14,4 +14,5 @@ Changed interface:
 
 Other:
 - Windows builds now default to the `native` platform instead of `win32A` or `win64`. Please specify it explicitly if you depedent on it.
-- The undocumented and deprecated command-line options `--template <template>` and `--template-format <template>` has been removed. Please use `--template=` and `--template-format=` instead.
+- The undocumented and deprecated command-line options `--template <template>` and `--template-format <template>` has been removed. Please use `--template=` and `--template-format=` instead.
+- If a addon cannot be found it will bail out immediately instead of continously writing errors and failing the analysis at the end.

releasenotes.txt

@@ -403,11 +403,9 @@ def test_invalid_addon_json(tmpdir):
     args = ['--addon={}'.format(addon_file), '--enable=all', test_file]
 
     exitcode, stdout, stderr = cppcheck(args)
-    assert exitcode == 0  # TODO: needs to be 1
+    assert exitcode == 1
     lines = stdout.splitlines()
     assert lines == [
-        'Checking {} ...'.format(test_file),
-        'Loading {} failed. syntax error at line 2 near: '.format(addon_file),
         'Loading {} failed. syntax error at line 2 near: '.format(addon_file)
     ]
     assert stderr == ''
@@ -531,3 +529,12 @@ class A {
 
     _, _, stderr = cppcheck(args)
     assert stderr == "{}:4:0: style: The function 'f' is never used. [unusedFunction]\n".format(test_h_file)
+
+
+def test_missing_addon(tmpdir):
+    args = ['--addon=misra2', 'file.c']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1
+    assert stdout == 'Did not find addon misra2.py\n'
+    assert stderr == ""

test/cli/test-other.py

@@ -247,6 +247,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(typedefMaxTimeInvalid2);
         TEST_CASE(templateMaxTime);
         TEST_CASE(templateMaxTime);
+        TEST_CASE(addon);
 
         TEST_CASE(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -1840,6 +1841,16 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
     }
 
+    void addon() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--addon=misra", "file.cpp"};
+        settings->addons.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(1, settings->addons.size());
+        ASSERT_EQUALS("misra", *settings->addons.cbegin());
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
     void ignorepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};