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

AutoTest: Improve finding executables for cmake based projects

Browse Source 
Depending on the structure of a project we might end up inside a
library and will not find the correct executable for running a
test. This patch improves finding the correct executable, but
depending on the complexity of the project it will not be able
to fix all circumstances.

Task-number: QTCREATORBUG-17882
Change-Id: I847bb40426bc1b874c2dc6a2a6880b11fe048bda
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2017-06-27 11:04:21 +02:00
parent 56db0df2e6
commit a72b38b8c9
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/autotest/gtest/gtesttreeitem.cpp
View File

@@ -327,5 +327,17 @@ QString GTestTreeItem::nameSuffix() const
return suffix; return suffix;
} }
QSet<QString> GTestTreeItem::internalTargets() const
{
QSet<QString> result;
const auto cppMM = CppTools::CppModelManager::instance();
const auto projectInfo = cppMM->projectInfo(ProjectExplorer::SessionManager::startupProject());
for (const CppTools::ProjectPart::Ptr projectPart : projectInfo.projectParts()) {
if (projectPart->projectFile == proFile())
result.insert(projectPart->buildSystemTarget);
}
return result;
}
} // namespace Internal } // namespace Internal
} // namespace Autotest } // namespace Autotest

1
src/plugins/autotest/gtest/gtesttreeitem.h
View File

@@ -67,6 +67,7 @@ public:
GTestTreeItem::TestStates state, GTestTreeItem::TestStates state,
const QString &proFile) const; const QString &proFile) const;
QString nameSuffix() const; QString nameSuffix() const;
QSet<QString> internalTargets() const override;
private: private:
GTestTreeItem::TestStates m_state; GTestTreeItem::TestStates m_state;