aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/autotest/testconfiguration.cpp
diff options
context:
space:
mode:
authorChristian Stenger <[email protected]>2018-04-13 09:22:26 +0200
committerChristian Stenger <[email protected]>2018-04-13 12:04:45 +0000
commitd9dfddac73c641a07a50f069578a36533a26ef9d (patch)
treeb8694c4986ced0d007c1efa3e3f182654ebc5e2c /src/plugins/autotest/testconfiguration.cpp
parent83c6a4916cddc267ad7ab9d83fb383b7084c5c8b (diff)
AutoTest: Simplify determination of RunConfiguration
Since bc698d4ce61b 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 <[email protected]>
Diffstat (limited to 'src/plugins/autotest/testconfiguration.cpp')
-rw-r--r--src/plugins/autotest/testconfiguration.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp
index 6e26b910a33..09617d17a4a 100644
--- a/src/plugins/autotest/testconfiguration.cpp
+++ b/src/plugins/autotest/testconfiguration.cpp
@@ -148,13 +148,7 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
BuildTargetInfo targetInfo
= Utils::findOrDefault(target->applicationTargets().list,
[&buildSystemTargets] (const BuildTargetInfo &bti) {
- return Utils::anyOf(buildSystemTargets, [&bti](const QString &b) {
- const QStringList targWithProjectFile = b.split('|');
- if (targWithProjectFile.size() != 2) // some build targets might miss the project file
- return false;
- return !bti.targetFilePath.isEmpty() && targWithProjectFile.at(0) == bti.buildKey
- && targWithProjectFile.at(1).startsWith(bti.projectFilePath.toString());
- });
+ return buildSystemTargets.contains(bti.buildKey);
});
// we might end up with an empty targetFilePath - e.g. when having a library we just link to
// there would be no BuildTargetInfo that could match