diff --git a/src/plugins/autotest/boost/boosttestoutputreader.cpp b/src/plugins/autotest/boost/boosttestoutputreader.cpp index a9668fc8e80..b87f9ab764b 100644 --- a/src/plugins/autotest/boost/boosttestoutputreader.cpp +++ b/src/plugins/autotest/boost/boosttestoutputreader.cpp @@ -51,10 +51,8 @@ BoostTestOutputReader::BoostTestOutputReader(const QFutureInterfaceexitCode(); if (m_reportLevel == ReportLevel::No && m_testCaseCount != -1) { int reportedFailsAndSkips = m_summary[ResultType::Fail] + m_summary[ResultType::Skip]; diff --git a/src/plugins/autotest/boost/boosttestoutputreader.h b/src/plugins/autotest/boost/boosttestoutputreader.h index b5cab378a7c..2bfd9af3f94 100644 --- a/src/plugins/autotest/boost/boosttestoutputreader.h +++ b/src/plugins/autotest/boost/boosttestoutputreader.h @@ -47,7 +47,7 @@ protected: TestResultPtr createDefaultResult() const override; private: - void onFinished(); + void onDone(); void sendCompleteInformation(); void handleMessageMatch(const QRegularExpressionMatch &match); void reportNoOutputFinish(const QString &description, ResultType type); diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp index 0c9f0b87334..4935b6599b3 100644 --- a/src/plugins/autotest/gtest/gtestoutputreader.cpp +++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp @@ -45,9 +45,8 @@ GTestOutputReader::GTestOutputReader(const QFutureInterface &futu , m_projectFile(projectFile) { if (m_testApplication) { - connect(m_testApplication, &Utils::QtcProcess::finished, - this, [this]() { - int exitCode = m_testApplication->exitCode(); + connect(m_testApplication, &Utils::QtcProcess::done, this, [this] { + const int exitCode = m_testApplication->exitCode(); if (exitCode == 1 && !m_description.isEmpty()) { createAndReportResult(tr("Running tests failed.\n %1\nExecutable: %2") .arg(m_description).arg(id()), ResultType::MessageFatal); diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 942730ba9d8..90c4f72a1d0 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -197,7 +197,7 @@ bool TestRunner::currentConfigValid() m_fakeFutureInterface->reportFinished(); onFinished(); } else { - onProcessFinished(); + onProcessDone(); } return false; } @@ -263,21 +263,20 @@ void TestRunner::scheduleNext() return; if (!m_currentConfig->project()) - onProcessFinished(); + onProcessDone(); setUpProcess(); - QTC_ASSERT(m_currentProcess, onProcessFinished(); return); + QTC_ASSERT(m_currentProcess, onProcessDone(); return); QTC_ASSERT(!m_currentOutputReader, delete m_currentOutputReader); m_currentOutputReader = m_currentConfig->outputReader(*m_fakeFutureInterface, m_currentProcess); - QTC_ASSERT(m_currentOutputReader, onProcessFinished();return); + QTC_ASSERT(m_currentOutputReader, onProcessDone();return); connect(m_currentOutputReader, &TestOutputReader::newOutputLineAvailable, TestResultsPane::instance(), &TestResultsPane::addOutputLine); setUpProcessEnv(); - connect(m_currentProcess, &Utils::QtcProcess::finished, - this, &TestRunner::onProcessFinished); + connect(m_currentProcess, &Utils::QtcProcess::done, this, &TestRunner::onProcessDone); const int timeout = AutotestPlugin::settings()->timeout; m_cancelTimer.setInterval(timeout); m_cancelTimer.start(); @@ -292,7 +291,7 @@ void TestRunner::scheduleNext() reportResult(ResultType::MessageFatal, tr("Failed to start test for project \"%1\".").arg(m_currentConfig->displayName()) + processInformation(m_currentProcess) + rcInfo(m_currentConfig)); - onProcessFinished(); + onProcessDone(); } } @@ -315,7 +314,7 @@ void TestRunner::cancelCurrent(TestRunner::CancelReason reason) } } -void TestRunner::onProcessFinished() +void TestRunner::onProcessDone() { if (m_executingTests && m_currentConfig) { QTC_CHECK(m_fakeFutureInterface); diff --git a/src/plugins/autotest/testrunner.h b/src/plugins/autotest/testrunner.h index 961312b6410..0d41f7d161c 100644 --- a/src/plugins/autotest/testrunner.h +++ b/src/plugins/autotest/testrunner.h @@ -90,7 +90,7 @@ private: void setUpProcessEnv(); void scheduleNext(); void cancelCurrent(CancelReason reason); - void onProcessFinished(); + void onProcessDone(); void resetInternalPointers(); void runTests();