Revert "Disable tests with qemu-arm & developer-build configurations in the CI"
We don't want to have untested qtbase.
This reverts commit 3598ffcc26.
This change also skips two network tests on b2qt.
Change-Id: I5c6f5e19487775f0a1c0feafa5e085208cbf7e9a
Reviewed-by: Liang Qi <liang.qi@qt.io>
bb10
parent
79fd1cb2c6
commit
ee8ba0e0ca
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
[rewriteDocument]
|
||||
winrt
|
||||
ci b2qt
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Reference in New Issue