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

AutoTest: Reindent properly runTestsHelper() [part 2]

Browse Source 
Otherwise the grandparent diff looks giant.

Change-Id: I05a862e01a712dbbec49b4b21b77a157bd483268
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-13 01:59:02 +01:00
parent 05434b71e2
commit 46b2d58310
1 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,66 +363,66 @@ void TestRunner::runTestsHelper()
} }
return SetupResult::Continue; return SetupResult::Continue;
}; };
const auto onProcessSetup = [this, selectedTests, repeater, storage](Process &process) { const auto onProcessSetup = [this, selectedTests, repeater, storage](Process &process) {
ITestConfiguration *config = selectedTests.at(repeater.iteration()); 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));
QTC_ASSERT(testStorage->m_outputReader, return); QTC_ASSERT(testStorage->m_outputReader, return);
connect(testStorage->m_outputReader.get(), &TestOutputReader::newResult, connect(testStorage->m_outputReader.get(), &TestOutputReader::newResult,
this, &TestRunner::testResultReady); this, &TestRunner::testResultReady);
connect(testStorage->m_outputReader.get(), &TestOutputReader::newOutputLineAvailable, connect(testStorage->m_outputReader.get(), &TestOutputReader::newOutputLineAvailable,
TestResultsPane::instance(), &TestResultsPane::addOutputLine); TestResultsPane::instance(), &TestResultsPane::addOutputLine);
CommandLine command{config->testExecutable(), {}}; CommandLine command{config->testExecutable(), {}};
if (config->testBase()->type() == ITestBase::Framework) { if (config->testBase()->type() == ITestBase::Framework) {
TestConfiguration *current = static_cast<TestConfiguration *>(config); TestConfiguration *current = static_cast<TestConfiguration *>(config);
QStringList omitted; QStringList omitted;
command.addArgs(current->argumentsForTestRunner(&omitted).join(' '), CommandLine::Raw); command.addArgs(current->argumentsForTestRunner(&omitted).join(' '), CommandLine::Raw);
if (!omitted.isEmpty()) { if (!omitted.isEmpty()) {
const QString &details = constructOmittedDetailsString(omitted); const QString &details = constructOmittedDetailsString(omitted);
reportResult(ResultType::MessageWarn, details.arg(current->displayName())); reportResult(ResultType::MessageWarn, details.arg(current->displayName()));
}
} else {
TestToolConfiguration *current = static_cast<TestToolConfiguration *>(config);
command.setArguments(current->commandLine().arguments());
} }
process.setCommand(command); } else {
TestToolConfiguration *current = static_cast<TestToolConfiguration *>(config);
command.setArguments(current->commandLine().arguments());
}
process.setCommand(command);
process.setWorkingDirectory(config->workingDirectory()); process.setWorkingDirectory(config->workingDirectory());
const Environment &original = config->environment(); const Environment &original = config->environment();
Environment environment = config->filteredEnvironment(original); Environment environment = config->filteredEnvironment(original);
const EnvironmentItems removedVariables = Utils::filtered( const EnvironmentItems removedVariables = Utils::filtered(
original.diff(environment), [](const EnvironmentItem &it) { original.diff(environment), [](const EnvironmentItem &it) {
return it.operation == EnvironmentItem::Unset; return it.operation == EnvironmentItem::Unset;
}); });
if (!removedVariables.isEmpty()) { if (!removedVariables.isEmpty()) {
const QString &details = constructOmittedVariablesDetailsString(removedVariables) const QString &details = constructOmittedVariablesDetailsString(removedVariables)
.arg(config->displayName()); .arg(config->displayName());
reportResult(ResultType::MessageWarn, details); reportResult(ResultType::MessageWarn, details);
} }
process.setEnvironment(environment); process.setEnvironment(environment);
m_cancelTimer.setInterval(testSettings().timeout()); m_cancelTimer.setInterval(testSettings().timeout());
m_cancelTimer.start(); m_cancelTimer.start();
qCInfo(runnerLog) << "Command:" << process.commandLine().executable(); qCInfo(runnerLog) << "Command:" << process.commandLine().executable();
qCInfo(runnerLog) << "Arguments:" << process.commandLine().arguments(); qCInfo(runnerLog) << "Arguments:" << process.commandLine().arguments();
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, selectedTests, repeater, storage](const Process &process) { const auto onProcessDone = [this, selectedTests, repeater, storage](const Process &process) {
ITestConfiguration *config = selectedTests.at(repeater.iteration()); 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) {
reportResult(ResultType::MessageFatal, reportResult(ResultType::MessageFatal,
Tr::tr("Failed to start test for project \"%1\".").arg(config->displayName()) Tr::tr("Failed to start test for project \"%1\".").arg(config->displayName())
+ processInformation(&process) + rcInfo(config)); + processInformation(&process) + rcInfo(config));
} }
if (testStorage->m_outputReader) if (testStorage->m_outputReader)
testStorage->m_outputReader->onDone(process.exitCode()); testStorage->m_outputReader->onDone(process.exitCode());
if (process.exitStatus() == QProcess::CrashExit) { if (process.exitStatus() == QProcess::CrashExit) {
if (testStorage->m_outputReader) if (testStorage->m_outputReader)