aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qv4debugger
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-08-13 12:00:39 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-15 11:52:22 +0200
commitaeac974b8361e9f92684a0f7cb7e38f4763bb7f1 (patch)
tree990efe4c35ac3cffea120b740513597fab181950 /tests/auto/qml/qv4debugger
parentaad119d043bb51a42e4f55ae1708f5e31f06e14c (diff)
Improve reliability of v4 debugger tests
Sometimes the test hangs on shutdown. Don't wait for the finished signal to be emitted with an event loop, instead do the QThread equivalent of pthread_join: wait(). Change-Id: I3583e8366c08fc0446682d124d86df4ffa3290d3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qv4debugger')
-rw-r--r--tests/auto/qml/qv4debugger/tst_qv4debugger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
index c6ecd1938a..7d8f02a952 100644
--- a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
@@ -176,7 +176,7 @@ void tst_qv4debugger::init()
void tst_qv4debugger::cleanup()
{
m_javaScriptThread->exit();
- waitForSignal(m_javaScriptThread, SIGNAL(finished()), /*timeout*/ 0);
+ m_javaScriptThread->wait();
delete m_engine;
delete m_javaScriptThread;
m_engine = 0;