diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-28 16:36:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-28 17:53:24 +0000 |
| commit | 807f3d32b162453e1305a588f92786f442dbb012 (patch) | |
| tree | 894df55528baf41f199e1c7e5f76c6c255bf32e3 /tests/auto/corelib/tools/qsharedpointer | |
| parent | b7227d7c40c856674cb7608f2eed6e61ca327442 (diff) | |
tst_QSharedPointer: Terminate hanging qmake-processes
Change-Id: I580ff3ccbecba81c09ce3fc3e082b906f956171d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/corelib/tools/qsharedpointer')
| -rw-r--r-- | tests/auto/corelib/tools/qsharedpointer/externaltests.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp index e8f56fc1d3..62dd33131b 100644 --- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp @@ -593,6 +593,8 @@ namespace QTest { } else { ok = qmake.waitForFinished(); exitCode = qmake.exitCode(); + if (!ok) + qmake.terminate(); std_out += qmake.readAllStandardOutput(); std_err += qmake.readAllStandardError(); |