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

AutoTest: Use LoopRepeat for test runner

Browse Source 
Change-Id: I2b7eb32732aa1f12b23a719d0c4cce14dd0d7114
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2024-01-12 21:01:08 +01:00
parent 54e0433975
commit f44112ed22
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/autotest/testrunner.cpp
View File

@@ -347,13 +347,13 @@ void TestRunner::runTestsHelper()
std::unique_ptr<TestOutputReader> m_outputReader; std::unique_ptr<TestOutputReader> m_outputReader;
}; };
QList<GroupItem> tasks{finishAllAndSuccess}; const QList<ITestConfiguration *> selectedTests = m_selectedTests;
const LoopRepeat repeater(selectedTests.size());
for (ITestConfiguration *config : m_selectedTests) {
QTC_ASSERT(config, continue);
const Storage<TestStorage> storage; const Storage<TestStorage> storage;
const auto onSetup = [this, config] { const auto onSetup = [this, selectedTests, repeater] {
ITestConfiguration *config = selectedTests.at(repeater.iteration());
QTC_ASSERT(config, return SetupResult::StopWithError);
if (!config->project()) if (!config->project())
return SetupResult::StopWithSuccess; return SetupResult::StopWithSuccess;
if (config->testExecutable().isEmpty()) { if (config->testExecutable().isEmpty()) {
@@ -363,7 +363,8 @@ void TestRunner::runTestsHelper()
} }
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onProcessSetup = [this, config, storage](Process &process) { const auto onProcessSetup = [this, selectedTests, repeater, storage](Process &process) {
ITestConfiguration *config = selectedTests.at(repeater.iteration());
TestStorage *testStorage = storage.activeStorage(); TestStorage *testStorage = storage.activeStorage();
QTC_ASSERT(testStorage, return); QTC_ASSERT(testStorage, return);
testStorage->m_outputReader.reset(config->createOutputReader(&process)); testStorage->m_outputReader.reset(config->createOutputReader(&process));
@@ -410,7 +411,8 @@ void TestRunner::runTestsHelper()
qCInfo(runnerLog) << "Working directory:" << process.workingDirectory(); qCInfo(runnerLog) << "Working directory:" << process.workingDirectory();
qCDebug(runnerLog) << "Environment:" << process.environment().toStringList(); qCDebug(runnerLog) << "Environment:" << process.environment().toStringList();
}; };
const auto onProcessDone = [this, config, storage](const Process &process) { const auto onProcessDone = [this, selectedTests, repeater, storage](const Process &process) {
ITestConfiguration *config = selectedTests.at(repeater.iteration());
TestStorage *testStorage = storage.activeStorage(); TestStorage *testStorage = storage.activeStorage();
QTC_ASSERT(testStorage, return); QTC_ASSERT(testStorage, return);
if (process.result() == ProcessResult::StartFailed) { if (process.result() == ProcessResult::StartFailed) {
@@ -444,16 +446,19 @@ void TestRunner::runTestsHelper()
testStorage->m_outputReader->resetCommandlineColor(); testStorage->m_outputReader->resetCommandlineColor();
} }
}; };
const Group group {
const Group root {
finishAllAndSuccess,
repeater,
Group {
finishAllAndSuccess, finishAllAndSuccess,
storage, storage,
onGroupSetup(onSetup), onGroupSetup(onSetup),
ProcessTask(onProcessSetup, onProcessDone) ProcessTask(onProcessSetup, onProcessDone)
};
tasks.append(group);
} }
};
m_taskTree.reset(new TaskTree(tasks)); m_taskTree.reset(new TaskTree(root));
connect(m_taskTree.get(), &TaskTree::done, this, &TestRunner::onFinished); connect(m_taskTree.get(), &TaskTree::done, this, &TestRunner::onFinished);
auto progress = new TaskProgress(m_taskTree.get()); auto progress = new TaskProgress(m_taskTree.get());