Commit 06e02480 authored by Eike Ziller's avatar Eike Ziller Committed by Christian Stenger
Browse files

Use Utils::runAsync instead of QtConcurrent::run



QtConcurrent has the issue that it uses a globally shared thread pool,
with no finer granularity for simulataneous tasks.

Create an explicit event loop for the test runner for that.

Change-Id: Idcf2f125e111d94a5a60e5b136fd875225326e14
Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
parent 9a3efd49
......@@ -800,7 +800,7 @@ void TestCodeParser::scanForTests(const QStringList &fileList)
return;
}
QFuture<void> future = QtConcurrent::run(&performParse, list, this);
QFuture<void> future = Utils::runAsync<void>(&performParse, list, this);
Core::FutureProgress *progress
= Core::ProgressManager::addTask(future, isFullParse ? tr("Scanning for Tests")
: tr("Refreshing Tests List"),
......
......@@ -109,6 +109,7 @@ static void performTestRun(QFutureInterface<void> &futureInterface,
const QList<TestConfiguration *> selectedTests, const int timeout,
const QString metricsOption)
{
QEventLoop eventLoop;
int testCaseCount = 0;
foreach (TestConfiguration *config, selectedTests) {
config->completeTestInformation();
......@@ -198,7 +199,7 @@ static void performTestRun(QFutureInterface<void> &futureInterface,
emitTestResultCreated(new FaultyTestResult(Result::MessageFatal,
QObject::tr("Test run canceled by user.")));
}
qApp->processEvents();
eventLoop.processEvents();
}
}
......@@ -274,8 +275,8 @@ void TestRunner::runTests()
TestResultsPane::instance(), &TestResultsPane::addTestResult,
Qt::QueuedConnection);
QFuture<void> future = QtConcurrent::run(&performTestRun, m_selectedTests, settings->timeout,
metricsOption);
QFuture<void> future = Utils::runAsync<void>(&performTestRun, m_selectedTests, settings->timeout,
metricsOption);
Core::FutureProgress *progress = Core::ProgressManager::addTask(future, tr("Running Tests"),
Autotest::Constants::TASK_INDEX);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment