From 507933467fe9d5f61d00a8a5eb6367a8eeb4684a Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 25 Jan 2024 14:15:21 +0100 Subject: [PATCH] AutoTest: Reuse LoopList Instead of LoopRepeat + container capture. Change-Id: Icb243d7ac902eed95503d7d1a5ac007f4f6c705d Reviewed-by: Reviewed-by: hjk --- src/plugins/autotest/testrunner.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index d5f96fa4758..3631459fec4 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -364,12 +364,11 @@ void TestRunner::runTestsHelper() std::unique_ptr m_outputReader; }; - const QList selectedTests = m_selectedTests; - const LoopRepeat repeater(selectedTests.size()); + const LoopList iterator(m_selectedTests); const Storage storage; - const auto onSetup = [this, selectedTests, repeater, storage](Process &process) { - ITestConfiguration *config = selectedTests.at(repeater.iteration()); + const auto onSetup = [this, iterator, storage](Process &process) { + ITestConfiguration *config = *iterator; QTC_ASSERT(config, return SetupResult::StopWithError); if (!config->project()) return SetupResult::StopWithSuccess; @@ -425,8 +424,8 @@ void TestRunner::runTestsHelper() qCDebug(runnerLog) << "Environment:" << process.environment().toStringList(); return SetupResult::Continue; }; - const auto onDone = [this, selectedTests, repeater, storage](const Process &process) { - ITestConfiguration *config = selectedTests.at(repeater.iteration()); + const auto onDone = [this, iterator, storage](const Process &process) { + ITestConfiguration *config = *iterator; TestStorage *testStorage = storage.activeStorage(); QTC_ASSERT(testStorage, return); if (process.result() == ProcessResult::StartFailed) { @@ -463,7 +462,7 @@ void TestRunner::runTestsHelper() const Group root { finishAllAndSuccess, - repeater, + iterator, Group { storage, ProcessTask(onSetup, onDone)