diff options
| -rw-r--r-- | tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickimage/tst_qquickimage.cpp | 12 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp index 722f411b76..9ba773cfea 100644 --- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp @@ -135,10 +135,12 @@ void tst_qquickborderimage::imageSource() QFETCH(bool, remote); QFETCH(QString, error); +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) if (qstrcmp(QTest::currentDataTag(), "remote") == 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) { 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())); 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())); |