diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-31 10:59:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-02 18:17:57 +0000 |
| commit | 8d09829fd445ef8c434fe184a9478d2015d096e7 (patch) | |
| tree | 6ce96dde095f5934fa876e4d65193d675018c4d6 /tests/auto/qml/debugger/qqmlprofilerservice | |
| parent | e26ac7911613cb9c572b81820e427fbd0a5874f6 (diff) | |
Ignore qqmldebugjs/profilerservice failures in win/gcc
Amends 80e03bbd9a42401d50af450aff5351c3a0c95444 for dev, adapting
to tests in dev.
Task-number: Task-number: QTQAINFRA-1334
Change-Id: I1aede768f40f42bfc2af7caf342f7cf2d06c523a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'tests/auto/qml/debugger/qqmlprofilerservice')
| -rw-r--r-- | tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST b/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST new file mode 100644 index 0000000000..5fb1dc193b --- /dev/null +++ b/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST @@ -0,0 +1,2 @@ +# QTQAINFRA-1334 +windows gcc diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp index b8e1f1f21d..e5eb1c428f 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp @@ -327,9 +327,12 @@ void tst_QQmlProfilerService::connect(bool block, const QString &testFile, bool .arg(restrictServices ? QStringLiteral(",services:CanvasFrameRate") : QString()) << QQmlDataTest::instance()->testFile(testFile); - m_process = new QQmlDebugProcess(executable, this); - m_process->start(QStringList() << arguments); - QVERIFY2(m_process->waitForSessionStart(), "Could not launch application, or did not get 'Waiting for connection'."); + QScopedPointer<QQmlDebugProcess> process; + process.reset(new QQmlDebugProcess(executable, this)); + process->start(QStringList() << arguments); + QVERIFY2(process->waitForSessionStart(), "Could not launch application, or did not get 'Waiting for connection'."); + + m_process = process.take(); m_connection = new QQmlDebugConnection(); m_client = new QQmlProfilerTestClient(m_connection); @@ -550,6 +553,8 @@ void tst_QQmlProfilerService::connect() QFETCH(bool, traceEnabled); connect(blockMode, "test.qml", restrictMode); + if (QTest::currentTestFailed() || QTestResult::skipCurrentTest()) + return; // if the engine is waiting, then the first message determines if it starts with trace enabled if (!traceEnabled) |