diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-06-04 16:07:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-05 12:10:07 +0200 |
| commit | ee8ba0e0ca0bbcc2e6f15b12244259b2d800f498 (patch) | |
| tree | 34e5c7a12491bf0e09ec34286870bffb11f91c33 | |
| parent | 79fd1cb2c631b6084bf10874205d27f5b53c907a (diff) | |
Revert "Disable tests with qemu-arm & developer-build configurations in the CI"
We don't want to have untested qtbase.
This reverts commit 3598ffcc26dbae14d88c32fabfc8be465eed8f61.
This change also skips two network tests on b2qt.
Change-Id: I5c6f5e19487775f0a1c0feafa5e085208cbf7e9a
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 04725c16b5..b0b732d372 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,9 +1,5 @@ TEMPLATE = subdirs -# Tests with developer-build started failing on qemu-armv7/armv8 after commit -# b88acae7a8e773c307e44f84da037d01d19e60f7 in qt5. -boot2qt:qtConfig(private_tests): return() - uikit { SUBDIRS = corelib qtHaveModule(gui): SUBDIRS += gui diff --git a/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST b/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST index 0ce46130ce..a35e0f303e 100644 --- a/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST +++ b/tests/auto/gui/text/qtextmarkdownwriter/BLACKLIST @@ -1,2 +1,3 @@ [rewriteDocument] winrt +ci b2qt diff --git a/tests/auto/network/selftest/tst_networkselftest.cpp b/tests/auto/network/selftest/tst_networkselftest.cpp index a540e18f48..a00c5e9770 100644 --- a/tests/auto/network/selftest/tst_networkselftest.cpp +++ b/tests/auto/network/selftest/tst_networkselftest.cpp @@ -44,6 +44,10 @@ void tst_NetworkSelftest::testServerIsAvailableInCI() if (!qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci")) QSKIP("Not running in the CI"); + if (qEnvironmentVariable("QT_QPA_PLATFORM").contains("offscreen") + && !qEnvironmentVariableIsEmpty("QEMU_LD_PREFIX")) + QSKIP("Not support yet for B2Qt"); + #if !defined(QT_TEST_SERVER) QVERIFY2(QtNetworkSettings::verifyTestNetworkSettings(), "Test server must be available when running in the CI"); diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp index 009c5b7240..6414aa6c82 100644 --- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -137,6 +137,10 @@ private slots: void tst_QSocks5SocketEngine::initTestCase() { + if (qEnvironmentVariable("QT_QPA_PLATFORM").contains("offscreen") + && !qEnvironmentVariableIsEmpty("QEMU_LD_PREFIX")) + QSKIP("Not support yet for B2Qt"); + #ifdef QT_TEST_SERVER QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::socksProxyServerName(), 1080)); QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpServerName(), 80)); |