From ee8ba0e0ca0bbcc2e6f15b12244259b2d800f498 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 4 Jun 2020 16:07:42 +0200 Subject: 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 --- tests/auto/network/selftest/tst_networkselftest.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto/network/selftest') 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"); -- cgit v1.2.3