From faadbee8b5ef976e93ec6e987fc860ae0044b9b5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 22 Apr 2015 10:19:05 +0200 Subject: 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 --- tests/auto/quick/qquickimage/tst_qquickimage.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests/auto/quick/qquickimage/tst_qquickimage.cpp') diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index b8c0f6a22a..b8ab60ff6a 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -171,6 +171,18 @@ void tst_qquickimage::imageSource() QFETCH(bool, cache); QFETCH(QString, error); + +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) + if (qstrcmp(QTest::currentDataTag(), "remote") == 0 + || qstrcmp(QTest::currentDataTag(), "remote redirected") == 0 + || qstrcmp(QTest::currentDataTag(), "remote svg") == 0 + || qstrcmp(QTest::currentDataTag(), "remote svgz") == 0 + || qstrcmp(QTest::currentDataTag(), "remote not found") == 0 + ) { + QSKIP("Remote tests cause occasional hangs in the CI system -- QTBUG-45655"); + } +#endif + TestHTTPServer server; if (remote) { QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString())); -- cgit v1.2.3