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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/plugins/android/androidrunnable.h
	src/plugins/android/androidrunner.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
	src/plugins/qmakeprojectmanager/qmakeproject.cpp
	src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp

Change-Id: I68093d44cfd672347eab82459ff70c21a32297ce
This commit is contained in:
Eike Ziller
2018-04-17 10:09:35 +02:00
parent 32a219f5c1 9a946decc3
commit 185fe0c705
49 changed files with 1014 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,15 +48,19 @@ GTestOutputReader::GTestOutputReader(const QFutureInterface<TestResultPtr> &futu
, m_executable(testApplication ? testApplication->program() : QString())
, m_projectFile(projectFile)
{
// on Windows abort() will result in normal termination, but exit code will be set to 3
if (Utils::HostOsInfo::isWindowsHost()) {
connect(m_testApplication,
static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
this, [this] (int exitCode, QProcess::ExitStatus /*exitStatus*/) {
if (exitCode == 3)
if (exitCode == 1 && !m_description.isEmpty()) {
// TODO tr()
const QString message{"Running test(s) failed\n" + m_description
+ "\nExecutable: " + m_executable};
createAndReportResult(message, Result::MessageFatal);
}
// on Windows abort() will result in normal termination, but exit code will be set to 3
if (Utils::HostOsInfo::isWindowsHost() && exitCode == 3)
reportCrash();
});
}
}
void GTestOutputReader::processOutput(const QByteArray &outputLine)