Fix #13983 (cli: clarify output when --file-filter value does not match) (danmar#7675)

Author: danmar

cli/cmdlineparser.cpp

@@ -213,7 +213,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
                 return matchglobs(mSettings.fileFilters, fs.filename());
             });
             if (fileSettings.empty()) {
-                mLogger.printError("could not find any files matching the filter.");
+                for (const std::string& f: mSettings.fileFilters)
+                    mLogger.printError("could not find any files matching the filter:" + f);
                 return false;
             }
         }
@@ -285,7 +286,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
         if (!mSettings.fileFilters.empty()) {
             files = filterFiles(mSettings.fileFilters, filesResolved);
             if (files.empty()) {
-                mLogger.printError("could not find any files matching the filter.");
+                for (const std::string& f: mSettings.fileFilters)
+                    mLogger.printError("could not find any files matching the filter:" + f);
                 return false;
             }
         }

test/cli/more-projects_test.py

@@ -389,7 +389,7 @@ def test_project_file_filter_no_match(tmpdir):
 
     args = ['--file-filter=*.c', '--project={}'.format(project_file)]
     out_lines = [
-        'cppcheck: error: could not find any files matching the filter.'
+        'cppcheck: error: could not find any files matching the filter:*.c'
     ]
 
     assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)

test/cli/other_test.py

@@ -988,7 +988,7 @@ def test_file_filter_no_match(tmpdir):
 
     args = ['--file-filter=*.c', test_file]
     out_lines = [
-        'cppcheck: error: could not find any files matching the filter.'
+        'cppcheck: error: could not find any files matching the filter:*.c'
     ]
 
     assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)

test/testcmdlineparser.cpp

@@ -208,6 +208,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(fileFilterFileWithDetailsSimplifiedPath);
         TEST_CASE(fileFilterFileWithDetailsCase);
         TEST_CASE(fileFilterStdin);
+        TEST_CASE(fileFilterNoMatch);
         TEST_CASE(fileList);
         TEST_CASE(fileListNoFile);
         TEST_CASE(fileListStdin);
@@ -1226,6 +1227,16 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("file2.cpp", settings->fileFilters[1]);
     }
 
+    void fileFilterNoMatch() {
+        REDIRECT;
+        RedirectInput input("notexist1.c\nnotexist2.cpp\n");
+        const char * const argv[] = {"cppcheck", "--file-filter=-", "."};
+        ASSERT(!fillSettingsFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: could not find any files matching the filter:notexist1.c\n"
+                      "cppcheck: error: could not find any files matching the filter:notexist2.cpp\n",
+                      logger->str());
+    }
+
     void fileList() {
         REDIRECT;
         ScopedFile file("files.txt",