1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QSharedPointer: Terminate hanging qmake-processes

Browse Source 
Change-Id: I580ff3ccbecba81c09ce3fc3e082b906f956171d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Friedemann Kleint 2017-06-28 16:36:02 +02:00
parent b7227d7c40
commit 807f3d32b1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
View File

@ -593,6 +593,8 @@ namespace QTest {
} else { } else {
ok = qmake.waitForFinished(); ok = qmake.waitForFinished();
exitCode = qmake.exitCode(); exitCode = qmake.exitCode();
if (!ok)
qmake.terminate();
std_out += qmake.readAllStandardOutput(); std_out += qmake.readAllStandardOutput();
std_err += qmake.readAllStandardError(); std_err += qmake.readAllStandardError();