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

TestRunner: Get rid of unneeded Utils:: prefix

Browse Source 
We are using Utils namespace in this file already.

Change-Id: Ib4b36782b3272eb4974d8dada4518b0d4eec2f21
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-01-13 13:27:25 +01:00
parent 39940a7200
commit 7e815270f1
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,14 +105,14 @@ void TestRunner::runTest(TestRunMode mode, const ITestTreeItem *item)
static QString processInformation(const QtcProcess *proc) static QString processInformation(const QtcProcess *proc)
{ {
QTC_ASSERT(proc, return {}); QTC_ASSERT(proc, return {});
const Utils::CommandLine command = proc->commandLine(); const CommandLine command = proc->commandLine();
QString information("\nCommand line: " + command.executable().toUserOutput() + ' ' + command.arguments()); QString information("\nCommand line: " + command.executable().toUserOutput() + ' ' + command.arguments());
QStringList important = { "PATH" }; QStringList important = { "PATH" };
if (Utils::HostOsInfo::isLinuxHost()) if (HostOsInfo::isLinuxHost())
important.append("LD_LIBRARY_PATH"); important.append("LD_LIBRARY_PATH");
else if (Utils::HostOsInfo::isMacHost()) else if (HostOsInfo::isMacHost())
important.append({ "DYLD_LIBRARY_PATH", "DYLD_FRAMEWORK_PATH" }); important.append({ "DYLD_LIBRARY_PATH", "DYLD_FRAMEWORK_PATH" });
const Utils::Environment &environment = proc->environment(); const Environment &environment = proc->environment();
for (const QString &var : important) for (const QString &var : important)
information.append('\n' + var + ": " + environment.value(var)); information.append('\n' + var + ": " + environment.value(var));
return information; return information;
@@ -137,9 +137,9 @@ static QString constructOmittedDetailsString(const QStringList &omitted)
"configuration page for \"%1\":") + '\n' + omitted.join('\n'); "configuration page for \"%1\":") + '\n' + omitted.join('\n');
} }
static QString constructOmittedVariablesDetailsString(const Utils::EnvironmentItems &diff) static QString constructOmittedVariablesDetailsString(const EnvironmentItems &diff)
{ {
auto removedVars = Utils::transform<QStringList>(diff, [](const Utils::EnvironmentItem &it) { auto removedVars = Utils::transform<QStringList>(diff, [](const EnvironmentItem &it) {
return it.name; return it.name;
}); });
return Tr::tr("Omitted the following environment variables for \"%1\":") return Tr::tr("Omitted the following environment variables for \"%1\":")
@@ -148,7 +148,7 @@ static QString constructOmittedVariablesDetailsString(const Utils::EnvironmentIt
bool TestRunner::currentConfigValid() bool TestRunner::currentConfigValid()
{ {
Utils::FilePath commandFilePath; FilePath commandFilePath;
if (m_currentConfig->testBase()->type() == ITestBase::Framework) { if (m_currentConfig->testBase()->type() == ITestBase::Framework) {
TestConfiguration *current = static_cast<TestConfiguration *>(m_currentConfig); TestConfiguration *current = static_cast<TestConfiguration *>(m_currentConfig);
commandFilePath = current->executableFilePath(); commandFilePath = current->executableFilePath();
@@ -188,12 +188,12 @@ void TestRunner::setUpProcess()
void TestRunner::setUpProcessEnv() void TestRunner::setUpProcessEnv()
{ {
Utils::CommandLine command = m_currentProcess->commandLine(); CommandLine command = m_currentProcess->commandLine();
if (m_currentConfig->testBase()->type() == ITestBase::Framework) { if (m_currentConfig->testBase()->type() == ITestBase::Framework) {
TestConfiguration *current = static_cast<TestConfiguration *>(m_currentConfig); TestConfiguration *current = static_cast<TestConfiguration *>(m_currentConfig);
QStringList omitted; QStringList omitted;
command.addArgs(current->argumentsForTestRunner(&omitted).join(' '), Utils::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()));
@@ -205,11 +205,11 @@ void TestRunner::setUpProcessEnv()
m_currentProcess->setCommand(command); m_currentProcess->setCommand(command);
m_currentProcess->setWorkingDirectory(m_currentConfig->workingDirectory()); m_currentProcess->setWorkingDirectory(m_currentConfig->workingDirectory());
const Utils::Environment &original = m_currentConfig->environment(); const Environment &original = m_currentConfig->environment();
Utils::Environment environment = m_currentConfig->filteredEnvironment(original); Environment environment = m_currentConfig->filteredEnvironment(original);
const Utils::EnvironmentItems removedVariables = Utils::filtered( const EnvironmentItems removedVariables = Utils::filtered(
original.diff(environment), [](const Utils::EnvironmentItem &it) { original.diff(environment), [](const EnvironmentItem &it) {
return it.operation == Utils::EnvironmentItem::Unset; return it.operation == EnvironmentItem::Unset;
}); });
if (!removedVariables.isEmpty()) { if (!removedVariables.isEmpty()) {
const QString &details = constructOmittedVariablesDetailsString(removedVariables) const QString &details = constructOmittedVariablesDetailsString(removedVariables)
@@ -245,7 +245,7 @@ void TestRunner::scheduleNext()
setUpProcessEnv(); setUpProcessEnv();
connect(m_currentProcess, &Utils::QtcProcess::done, this, &TestRunner::onProcessDone); connect(m_currentProcess, &QtcProcess::done, this, &TestRunner::onProcessDone);
const int timeout = AutotestPlugin::settings()->timeout; const int timeout = AutotestPlugin::settings()->timeout;
m_cancelTimer.setInterval(timeout); m_cancelTimer.setInterval(timeout);
m_cancelTimer.start(); m_cancelTimer.start();
@@ -549,14 +549,13 @@ void TestRunner::runTestsHelper()
scheduleNext(); scheduleNext();
} }
static void processOutput(TestOutputReader *outputreader, const QString &msg, static void processOutput(TestOutputReader *outputreader, const QString &msg, OutputFormat format)
Utils::OutputFormat format)
{ {
QByteArray message = msg.toUtf8(); QByteArray message = msg.toUtf8();
switch (format) { switch (format) {
case Utils::OutputFormat::StdErrFormat: case OutputFormat::StdErrFormat:
case Utils::OutputFormat::StdOutFormat: case OutputFormat::StdOutFormat:
case Utils::OutputFormat::DebugFormat: { case OutputFormat::DebugFormat: {
static const QByteArray gdbSpecialOut = "Qt: gdb: -nograb added to command-line options.\n" static const QByteArray gdbSpecialOut = "Qt: gdb: -nograb added to command-line options.\n"
"\t Use the -dograb option to enforce grabbing."; "\t Use the -dograb option to enforce grabbing.";
if (message.startsWith(gdbSpecialOut)) if (message.startsWith(gdbSpecialOut))
@@ -564,7 +563,7 @@ static void processOutput(TestOutputReader *outputreader, const QString &msg,
message.chop(1); // all messages have an additional \n at the end message.chop(1); // all messages have an additional \n at the end
for (const auto &line : message.split('\n')) { for (const auto &line : message.split('\n')) {
if (format == Utils::OutputFormat::StdOutFormat) if (format == OutputFormat::StdOutFormat)
outputreader->processStdOutput(line); outputreader->processStdOutput(line);
else else
outputreader->processStdError(line); outputreader->processStdError(line);
@@ -603,7 +602,7 @@ void TestRunner::debugTests()
return; return;
} }
const Utils::FilePath &commandFilePath = config->executableFilePath(); const FilePath &commandFilePath = config->executableFilePath();
if (commandFilePath.isEmpty()) { if (commandFilePath.isEmpty()) {
reportResult(ResultType::MessageFatal, Tr::tr("Could not find command \"%1\". (%2)") reportResult(ResultType::MessageFatal, Tr::tr("Could not find command \"%1\". (%2)")
.arg(config->executableFilePath().toString(), config->displayName())); .arg(config->executableFilePath().toString(), config->displayName()));
@@ -619,16 +618,16 @@ void TestRunner::debugTests()
inferior.command.setExecutable(commandFilePath); inferior.command.setExecutable(commandFilePath);
const QStringList args = config->argumentsForTestRunner(&omitted); const QStringList args = config->argumentsForTestRunner(&omitted);
inferior.command.setArguments(Utils::ProcessArgs::joinArgs(args)); inferior.command.setArguments(ProcessArgs::joinArgs(args));
if (!omitted.isEmpty()) { if (!omitted.isEmpty()) {
const QString &details = constructOmittedDetailsString(omitted); const QString &details = constructOmittedDetailsString(omitted);
reportResult(ResultType::MessageWarn, details.arg(config->displayName())); reportResult(ResultType::MessageWarn, details.arg(config->displayName()));
} }
Utils::Environment original(inferior.environment); Environment original(inferior.environment);
inferior.environment = config->filteredEnvironment(original); inferior.environment = config->filteredEnvironment(original);
const Utils::EnvironmentItems removedVariables = Utils::filtered( const EnvironmentItems removedVariables = Utils::filtered(
original.diff(inferior.environment), [](const Utils::EnvironmentItem &it) { original.diff(inferior.environment), [](const EnvironmentItem &it) {
return it.operation == Utils::EnvironmentItem::Unset; return it.operation == EnvironmentItem::Unset;
}); });
if (!removedVariables.isEmpty()) { if (!removedVariables.isEmpty()) {
const QString &details = constructOmittedVariablesDetailsString(removedVariables) const QString &details = constructOmittedVariablesDetailsString(removedVariables)
@@ -659,7 +658,7 @@ void TestRunner::debugTests()
connect(outputreader, &TestOutputReader::newOutputLineAvailable, connect(outputreader, &TestOutputReader::newOutputLineAvailable,
TestResultsPane::instance(), &TestResultsPane::addOutputLine); TestResultsPane::instance(), &TestResultsPane::addOutputLine);
connect(runControl, &RunControl::appendMessage, connect(runControl, &RunControl::appendMessage,
this, [outputreader](const QString &msg, Utils::OutputFormat format) { this, [outputreader](const QString &msg, OutputFormat format) {
processOutput(outputreader, msg, format); processOutput(outputreader, msg, format);
}); });