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

AutoTest: Simplify determination of RunConfiguration

Browse Source 
Since bc698d4ce6 the build system targets / build keys are
unique on their own.
Simplify the completion of test configurations and improve
readability.

Change-Id: I258e8a35a4740dd58b1365498ca399258092e0e3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2018-04-13 09:22:26 +02:00
parent 83c6a4916c
commit d9dfddac73
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotest/testtreeitem.cpp
View File

@@ -307,7 +307,7 @@ QSet<QString> TestTreeItem::internalTargets() const
return TestTreeItem::dependingInternalTargets(cppMM, m_filePath);
QSet<QString> targets;
for (const CppTools::ProjectPart::Ptr part : projectParts) {
targets.insert(part->buildSystemTarget + '|' + part->projectFile);
targets.insert(part->buildSystemTarget);
if (part->buildTargetType != CppTools::ProjectPart::Executable)
targets.unite(TestTreeItem::dependingInternalTargets(cppMM, m_filePath));
}
@@ -374,7 +374,7 @@ QSet<QString> TestTreeItem::dependingInternalTargets(CppTools::CppModelManager *
wasHeader ? file : correspondingFile);
for (const Utils::FileName &fn : dependingFiles) {
for (const CppTools::ProjectPart::Ptr part : cppMM->projectPart(fn))
result.insert(part->buildSystemTarget + '|' + part->projectFile);
result.insert(part->buildSystemTarget);
}
return result;
}