aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-28 10:37:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 13:34:20 +0200
commitbe72aeba3d7e30def561a3bdde051c6041f71ca7 (patch)
tree1111c06965a8ec7031461dc1cf038adc49094dc6 /tests
parent5564ba9987273949281b37533b798ebe59553f0e (diff)
Try to stabilize the multipleTransitions test
Change-Id: Ifeb53d6a1334623106428410aa2756935d7ba6e1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp2
-rw-r--r--tests/auto/quick/qquicklistview/tst_qquicklistview.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 4cf8fa64c5..30d92df275 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -446,12 +446,14 @@ void tst_QQmlProfilerService::scenegraphData()
QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), "No trace received in time.");
QVERIFY(m_client->traceMessages.count());
+ qDebug() << "XXX" << m_client->traceMessages.count();
// check that at least one frame was rendered
// there should be a SGPolishAndSync + SGRendererFrame + SGRenderLoopFrame sequence
// since the rendering happens in a different thread, there could be other unrelated events interleaved
int loopcheck = 0;
foreach (const QQmlProfilerData &msg, m_client->traceMessages) {
+ qDebug() << (msg.messageType == QQmlProfilerClient::SceneGraphFrame) << msg.messageType << msg.detailType;
if (msg.messageType == QQmlProfilerClient::SceneGraphFrame) {
if (loopcheck == 0 && msg.detailType == QQmlProfilerClient::SceneGraphContextFrame)
loopcheck = 1;
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 41f193cdb7..853f282bd9 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -6578,6 +6578,7 @@ void tst_QQuickListView::multipleTransitions()
}
}
listview->forceLayout();
+ QTest::qWait(200);
QCOMPARE(listview->count(), model.count());
// verify all items moved to the correct final positions