summaryrefslogtreecommitdiff
path: root/plugins/autotest/testtreemodel.cpp
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@theqtcompany.com>2015-01-07 09:33:57 +0100
committerChristian Stenger <christian.stenger@theqtcompany.com>2015-01-09 08:24:45 +0200
commit35939ac40275621240bb4d708802a934b3bd4c65 (patch)
tree94a1499298e3e720385a6eae4f2aa907a5228573 /plugins/autotest/testtreemodel.cpp
parentba8979d0660dbff201fac6ccc79d2741108608d1 (diff)
downloadqt-creator-35939ac40275621240bb4d708802a934b3bd4c65.tar.gz
Avoid executing unnamed Quick Tests if no related main is executed anyway
Change-Id: I521065577c195713bc252e6762a88011996f045c Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'plugins/autotest/testtreemodel.cpp')
-rw-r--r--plugins/autotest/testtreemodel.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/autotest/testtreemodel.cpp b/plugins/autotest/testtreemodel.cpp
index 8425c27c1d..7060203a41 100644
--- a/plugins/autotest/testtreemodel.cpp
+++ b/plugins/autotest/testtreemodel.cpp
@@ -465,6 +465,7 @@ QList<TestConfiguration *> TestTreeModel::getSelectedTests() const
} else {
TestConfiguration *tc = new TestConfiguration(QString(), QStringList());
tc->setTestCaseCount(1);
+ tc->setUnnamedOnly(true);
addProjectInformation(tc, mainFile);
foundMains.insert(mainFile, tc);
}
@@ -499,6 +500,7 @@ QList<TestConfiguration *> TestTreeModel::getSelectedTests() const
// unnamed test case
if (oldFunctions.size() == 0) {
tc->setTestCaseCount(tc->testCaseCount() + testFunctions.size());
+ tc->setUnnamedOnly(false);
} else {
oldFunctions << testFunctions;
tc->setTestCases(oldFunctions);
@@ -513,7 +515,8 @@ QList<TestConfiguration *> TestTreeModel::getSelectedTests() const
}
foreach (TestConfiguration *config, foundMains.values())
- result << config;
+ if (!config->unnamedOnly())
+ result << config;
return result;
}