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

AutoTest: Rename results executable

Browse Source 
Rename member to better reflect its meaning. It is used
as an identifier and might be something else than an
executable.

Change-Id: I082e3caaa3d94fcd7ab26ebc43bb0eb6da136d57
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-05-09 10:48:23 +02:00
committed by David Schulz
parent 1f3381a3c2
commit 78bd3f9ec3
13 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotest/gtest/gtestoutputreader.cpp
View File

@@ -45,7 +45,6 @@ GTestOutputReader::GTestOutputReader(const QFutureInterface<TestResultPtr> &futu
QProcess *testApplication, const QString &buildDirectory,
const QString &projectFile)
: TestOutputReader(futureInterface, testApplication, buildDirectory)
, m_executable(testApplication ? testApplication->program() : QString())
, m_projectFile(projectFile)
{
if (m_testApplication) {
@@ -54,7 +53,7 @@ GTestOutputReader::GTestOutputReader(const QFutureInterface<TestResultPtr> &futu
this, [this] (int exitCode, QProcess::ExitStatus /*exitStatus*/) {
if (exitCode == 1 && !m_description.isEmpty()) {
createAndReportResult(tr("Running tests failed.\n %1\nExecutable: %2")
.arg(m_description).arg(m_executable), Result::MessageFatal);
.arg(m_description).arg(id()), Result::MessageFatal);
}
// on Windows abort() will result in normal termination, but exit code will be set to 3
if (Utils::HostOsInfo::isWindowsHost() && exitCode == 3)
@@ -176,7 +175,7 @@ void GTestOutputReader::processOutput(const QByteArray &outputLine)
TestResultPtr GTestOutputReader::createDefaultResult() const
{
GTestResult *result = new GTestResult(m_executable, m_projectFile, m_currentTestName);
GTestResult *result = new GTestResult(id(), m_projectFile, m_currentTestName);
result->setTestSetName(m_currentTestSet);
result->setIteration(m_iteration);