From 807f3d32b162453e1305a588f92786f442dbb012 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 28 Jun 2017 16:36:02 +0200 Subject: [PATCH] tst_QSharedPointer: Terminate hanging qmake-processes Change-Id: I580ff3ccbecba81c09ce3fc3e082b906f956171d Reviewed-by: Simon Hausmann --- tests/auto/corelib/tools/qsharedpointer/externaltests.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp index e8f56fc1d3e..62dd33131bc 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();