starts with * => match any path

danmar · Apr 8, 2024 · fc9f3ef · fc9f3ef
1 parent cf2f7bb
commit fc9f3ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
@@ -763,8 +763,10 @@ QList<SuppressionList::Suppression> ProjectFile::getCheckingSuppressions() const
     const QRegularExpression re2("^[^/]+$");
     QList<SuppressionList::Suppression> result;
     for (SuppressionList::Suppression suppression : mSuppressions) {
-        if (re1.match(suppression.fileName.c_str()).hasMatch() || re2.match(suppression.fileName.c_str()).hasMatch())
-            suppression.fileName = QFileInfo(mFilename).absolutePath().toStdString() + "/" + suppression.fileName;
+        if (re1.match(suppression.fileName.c_str()).hasMatch() || re2.match(suppression.fileName.c_str()).hasMatch()) {
+            if (suppression.fileName[0] != '*')
+                suppression.fileName = QFileInfo(mFilename).absolutePath().toStdString() + "/" + suppression.fileName;
+        }
         result << suppression;
     }
     return result;

diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
@@ -166,7 +166,7 @@ void TestProjectFile::getCheckingSuppressionsStar() const
     ProjectFile projectFile;
     projectFile.setFilename("/some/path/123.cppcheck");
     projectFile.setSuppressions(suppressions);
-    QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "/some/path/*.cpp");
+    QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "*.cpp");
 }
 
 QTEST_MAIN(TestProjectFile)