diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2023-02-17 11:10:18 +0000 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2023-03-20 17:39:18 +0100 |
| commit | 6a66554d3bdb81d3b1d738d262ece3fa0934352b (patch) | |
| tree | bed9faa6655df812903e52aca21882f432bb1a3b /tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | |
| parent | 2834d4263a5c19587076c4edd3621a0daaa81a56 (diff) | |
Revert "Skip socket and server tests on Ubuntu 22.04 and QEMU"
This reverts commit 9286d46ee25f84d24a509e703e294f792cba1483.
Reason for revert: Should be fixed by 5c6814fb18760f65bab0f8b9cd623ee5c874a58d
Change-Id: I3a161df445af8dcbb61138d57e931a093a319027
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp')
| -rw-r--r-- | tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 342a835aed..4ff077c3c2 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <qglobal.h> - // To prevent windows system header files from re-defining min/max #define NOMINMAX 1 #if defined(_WIN32) @@ -37,11 +36,9 @@ #include <QNetworkProxy> #include <QSet> -#include <QSysInfo> #include <QList> #include "../../../network-settings.h" -#include <QtTest/private/qemulationdetector_p.h> #if defined(Q_OS_LINUX) #define SHOULD_CHECK_SYSCALL_SUPPORT @@ -140,11 +137,6 @@ void tst_QTcpServer::initTestCase_data() void tst_QTcpServer::initTestCase() { - QSysInfo sysInfo; - if (QTestPrivate::isRunningArmOnX86() - || (sysInfo.productType() == QStringLiteral("ubuntu") - && sysInfo.productVersion() == QStringLiteral("22.04"))) - QSKIP("Skipping test on Ubuntu 22.04 and QEMU, see QTBUG-107696."); #ifdef QT_TEST_SERVER QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::socksProxyServerName(), 1080)); QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpProxyServerName(), 3128)); |