diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-22 10:19:05 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-23 13:36:05 +0000 |
| commit | faadbee8b5ef976e93ec6e987fc860ae0044b9b5 (patch) | |
| tree | dc50cd4021aa36484ff37d247d6a90c239a77d2f /tests/auto/quick/qquicktext | |
| parent | 25b99c8f488c55d5a55874eacfb16b0d1b285cb0 (diff) | |
Skip the remote image source test and fix blacklisting of the other tests
There's a deadlock in qdbus that we're hitting with remote tests. We should
skip it and the other tests, but only on Linux.
Task-number: QTBUG-45655
Change-Id: I4523fdaa2c8855c5029667fb0e32b99ec563af27
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquicktext')
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index b9cd8bd0e2..ad21d177df 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -2062,11 +2062,13 @@ void tst_qquicktext::embeddedImages() QFETCH(QUrl, qmlfile); QFETCH(QString, error); +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) if (qstrcmp(QTest::currentDataTag(), "remote") == 0 || qstrcmp(QTest::currentDataTag(), "remote-error") == 0 || qstrcmp(QTest::currentDataTag(), "remote-relative") == 0) { QSKIP("Remote tests cause occasional hangs in the CI system -- QTBUG-45655"); } +#endif TestHTTPServer server; QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString())); |