fix #13948: CmdLineParser: Don't warn when --no-analyze-all-vs-configs is set in Cppcheck project file. (danmar#7608)

Author: ludviggunne

cli/cmdlineparser.cpp

@@ -550,8 +550,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         else if (std::strncmp(argv[i],"--addon-python=", 15) == 0)
             mSettings.addonPython.assign(argv[i]+15);
 
-        else if (std::strcmp(argv[i],"--analyze-all-vs-configs") == 0)
+        else if (std::strcmp(argv[i],"--analyze-all-vs-configs") == 0) {
             mSettings.analyzeAllVsConfigs = true;
+            mAnalyzeAllVsConfigsSetOnCmdLine = true;
+        }
 
         // Check configuration
         else if (std::strcmp(argv[i], "--check-config") == 0)
@@ -1036,8 +1038,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
         }
 
-        else if (std::strcmp(argv[i],"--no-analyze-all-vs-configs") == 0)
+        else if (std::strcmp(argv[i],"--no-analyze-all-vs-configs") == 0) {
             mSettings.analyzeAllVsConfigs = false;
+            mAnalyzeAllVsConfigsSetOnCmdLine = true;
+        }
 
         else if (std::strcmp(argv[i], "--no-check-headers") == 0)
             mSettings.checkHeaders = false;
@@ -1639,12 +1643,14 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
     if (!mSettings.analyzeAllVsConfigs) {
         if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) {
-            mLogger.printError("--no-analyze-all-vs-configs has no effect - no Visual Studio project provided.");
-            return Result::Fail;
+            if (mAnalyzeAllVsConfigsSetOnCmdLine) {
+                mLogger.printError("--no-analyze-all-vs-configs has no effect - no Visual Studio project provided.");
+                return Result::Fail;
+            }
+        } else {
+            // TODO: bail out when this does nothing
+            project.selectOneVsConfig(mSettings.platform.type);
         }
-
-        // TODO: bail out when this does nothing
-        project.selectOneVsConfig(mSettings.platform.type);
     }
 
     if (!mSettings.buildDir.empty() && !Path::isDirectory(mSettings.buildDir)) {

cli/cmdlineparser.h

@@ -174,6 +174,9 @@ class CmdLineParser {
     std::vector<std::string> mIgnoredPaths;
     Settings &mSettings;
     Suppressions &mSuppressions;
+    bool mAnalyzeAllVsConfigsSetOnCmdLine = false;
+
+    friend class TestCmdlineParser;
 };
 
 /// @}

test/cli/more-projects_test.py

@@ -896,4 +896,24 @@ def test_project_file_nested(tmp_path):
         'cppcheck: error: nested Cppcheck GUI projects are not supported.'
     ]
 
-    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_project_file_no_analyze_all_vs_configs(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt'):
+        pass
+
+    project_path = tmp_path / 'project.cppcheck'
+    with open(project_path, 'wt') as f:
+        f.write(
+"""<project>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+    <paths>
+        <dir name="."/>
+    </paths>
+</project>""")
+
+    ret, stdout, stderr = cppcheck(['--project=' + str(project_path)])
+    assert ret == 0, stdout
+    assert stderr == ''

test/testcmdlineparser.cpp

@@ -3138,20 +3138,23 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--analyze-all-vs-configs", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, settings->analyzeAllVsConfigs);
+        ASSERT(parser->mAnalyzeAllVsConfigsSetOnCmdLine);
     }
 
     void noAnalyzeAllVsConfigs() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--no-analyze-all-vs-configs", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: --no-analyze-all-vs-configs has no effect - no Visual Studio project provided.\n", logger->str());
+        ASSERT(parser->mAnalyzeAllVsConfigsSetOnCmdLine);
     }
 
     void noAnalyzeAllVsConfigs2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--analyze-all-vs-configs", "--no-analyze-all-vs-configs", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: --no-analyze-all-vs-configs has no effect - no Visual Studio project provided.\n", logger->str());
+        ASSERT(parser->mAnalyzeAllVsConfigsSetOnCmdLine);
     }
 
     void debugSymdb() {