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

Remove unneeded terminating of failed process

Browse Source 
Since we employ QtcProcess, the reaping of possibly
running process is done internally by QtcProcess already.

Change-Id: Ie65314a4aecf5bb1808b0f2c46a50503d82fd6fb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2021-10-14 14:36:53 +02:00
parent d40fa5b353
commit 39b36bf773
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -934,18 +934,10 @@ void CMakeBuildSystem::runCTest()
process.setCommand(cmd); process.setCommand(cmd);
process.start(); process.start();
if (!process.waitForStarted(1000) || !process.waitForFinished()) { if (!process.waitForStarted(1000) || !process.waitForFinished()
if (process.state() == QProcess::NotRunning) || process.exitCode() || process.exitStatus() != QProcess::NormalExit) {
return;
process.terminate();
if (process.waitForFinished(1000))
return;
process.kill();
process.waitForFinished(1000);
return; return;
} }
if (process.exitCode() || process.exitStatus() != QProcess::NormalExit)
return;
futureInterface.reportResult(process.readAllStandardOutput()); futureInterface.reportResult(process.readAllStandardOutput());
}); });