aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@nokia.com>2012-02-01 16:47:26 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-02 01:14:50 +0100
commitd19be6639999970105820d690952fee5b8e874ec (patch)
treef97459d69288ae24279f14844622539e6585b126 /tests/auto/declarative
parent540031dd8bbbff7bbb05bd2801bb0e92e3274bba (diff)
QmlProfiling: don't send v8 data if not profiling
Change-Id: I41085ed06bcf28e9de0a72f25076b91b9a3b2aea Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp
index 03d14062a8..c70d726fca 100644
--- a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp
+++ b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp
@@ -216,9 +216,14 @@ void tst_QV8ProfilerService::blockingConnectWithTraceDisabled()
connect(true);
QTRY_COMPARE(m_client->status(), QDeclarativeDebugClient::Enabled);
- m_client->startProfiling("");
m_client->stopProfiling("");
+ if (QDeclarativeDebugTest::waitForSignal(m_client, SIGNAL(complete()), 1000)) {
+ QString failMsg
+ = QString("Unexpected trace received! App output: %1\n\n").arg(m_process->output());
+ QFAIL(qPrintable(failMsg));
+ }
m_client->startProfiling("");
+ m_client->stopProfiling("");
if (!QDeclarativeDebugTest::waitForSignal(m_client, SIGNAL(complete()))) {
QString failMsg
= QString("No trace received in time. App output: %1\n\n").arg(m_process->output());
@@ -231,8 +236,8 @@ void tst_QV8ProfilerService::nonBlockingConnect()
connect(false);
QTRY_COMPARE(m_client->status(), QDeclarativeDebugClient::Enabled);
- m_client->stopProfiling("");
m_client->startProfiling("");
+ m_client->stopProfiling("");
if (!QDeclarativeDebugTest::waitForSignal(m_client, SIGNAL(complete()))) {
QString failMsg
= QString("No trace received in time. App output: %1\n\n").arg(m_process->output());