feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Support upcoming Catch2 v3

Browse Source 
Fixes: QTCREATORBUG-25582
Change-Id: I6ba7184d63aa6dd2b5b86d2d7d420297b59bef15
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2021-04-14 09:46:29 +02:00
parent d5daa1d0bb
commit d7c659fa87
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/autotest/catch/catchtestparser.cpp
View File

@@ -66,15 +66,24 @@ static bool isCatchMacro(const QString &macroName)
static bool includesCatchHeader(const CPlusPlus::Document::Ptr &doc, static bool includesCatchHeader(const CPlusPlus::Document::Ptr &doc,
const CPlusPlus::Snapshot &snapshot) const CPlusPlus::Snapshot &snapshot)
{ {
static const QString catchHeader("catch.hpp"); static const QStringList catchHeaders{"catch.hpp", // v2
"catch_all.hpp", // v3 - new approach
"catch_amalgamated.hpp",
"catch_test_macros.hpp",
"catch_template_test_macros.hpp"
};
for (const CPlusPlus::Document::Include &inc : doc->resolvedIncludes()) { for (const CPlusPlus::Document::Include &inc : doc->resolvedIncludes()) {
if (inc.resolvedFileName().endsWith(catchHeader)) for (const QString &catchHeader : catchHeaders) {
return true; if (inc.resolvedFileName().endsWith(catchHeader))
return true;
}
} }
for (const QString &include : snapshot.allIncludesForDocument(doc->fileName())) { for (const QString &include : snapshot.allIncludesForDocument(doc->fileName())) {
if (include.endsWith(catchHeader)) for (const QString &catchHeader : catchHeaders) {
return true; if (include.endsWith(catchHeader))
return true;
}
} }
return false; return false;