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

Author: firewave

cli/cppcheckexecutor.cpp

@@ -286,6 +286,17 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck)
         return EXIT_FAILURE;
     }
 
+    for (const std::string &addon : settings.addons) {
+        AddonInfo addonInfo;
+        const std::string failedToGetAddonInfo = addonInfo.getAddonInfo(addon, settings.exename);
+        if (!failedToGetAddonInfo.empty()) {
+            const ErrorMessage errmsg({}, emptyString, Severity::information, failedToGetAddonInfo, "failedToLoadAddon", Certainty::normal);
+            reportErr(errmsg);
+            return EXIT_FAILURE;
+        }
+        settings.addonInfos.emplace_back(std::move(addonInfo));
+    }
+
     if (settings.reportProgress)
         mLatestProgressOutputTime = std::time(nullptr);
 

gui/mainwindow.cpp

@@ -993,6 +993,7 @@ Settings MainWindow::getCppcheckSettings()
 
             addonFilePath.replace(QChar('\\'), QChar('/'));
 
+            // TODO: use picojson to generate the JSON
             QString json;
             json += "{ \"script\":\"" + addonFilePath + "\"";
             if (!pythonCmd.isEmpty())
@@ -1008,6 +1009,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()) {

lib/cppcheck.cpp

@@ -1327,14 +1327,7 @@ 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;
-        }
+    for (const AddonInfo &addonInfo : mSettings.addonInfos) {
         if (addonInfo.name != "misra" && !addonInfo.ctu && endsWith(files.back(), ".ctu-info"))
             continue;
 

lib/settings.h

@@ -21,6 +21,7 @@
 #define settingsH
 //---------------------------------------------------------------------------
 
+#include "addoninfo.h"
 #include "config.h"
 #include "errortypes.h"
 #include "importproject.h"
@@ -110,6 +111,9 @@ class CPPCHECKLIB 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;
 

releasenotes.txt

@@ -14,3 +14,4 @@ release notes for cppcheck-2.11
     - `constVariableReference`
     - `constVariablePointer`
 - More command-line parameters will now check if the given integer argument is actually valid. Several other internal string-to-integer conversions will not be error checked.
+- If a addon cannot be found it will bail out immediately instead of continously writing errors and failing the analysis at the end.

test/cli/test-other.py

@@ -60,4 +60,10 @@ def test_missing_include_inline_suppr(tmpdir):
     args = ['--enable=missingInclude', '--inline-suppr', test_file]
 
     _, _, stderr = cppcheck(args)
-    assert stderr == ''
+    assert stderr == ''
+
+def test_invalid_addon(tmpdir):
+    args = ['--addon=misra2', 'file.c']
+
+    _, _, stderr = cppcheck(args)
+    assert stderr == 'nofile:0:0: information: Did not find addon misra2.py [failedToLoadAddon]\n'

test/testcmdlineparser.cpp

@@ -222,6 +222,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(typedefMaxTimeInvalid2);
         TEST_CASE(templateMaxTime);
         TEST_CASE(templateMaxTime);
+        TEST_CASE(addon);
 
         TEST_CASE(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -1826,6 +1827,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(defParser.parseFromArgs(2, 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"};