diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt index 25ce15f0f0..55615bbae1 100644 --- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt @@ -11,7 +11,6 @@ qt_internal_add_test(tst_qtcpserver ../tst_qtcpserver.cpp LIBRARIES Qt::Network - Qt::TestPrivate QT_TEST_SERVER_LIST "danted" "cyrus" "squid" "ftp-proxy" ) 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 - // To prevent windows system header files from re-defining min/max #define NOMINMAX 1 #if defined(_WIN32) @@ -37,11 +36,9 @@ #include #include -#include #include #include "../../../network-settings.h" -#include #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)); diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 03485dc459..c3258f8a95 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -12,7 +12,6 @@ qt_internal_add_test(tst_qtcpsocket LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - Qt::TestPrivate QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" ) diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index ca81332205..50c9192ea2 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -40,7 +40,6 @@ #ifndef QT_NO_SSL #include #endif -#include #include #include #include @@ -62,7 +61,6 @@ #include "private/qhostinfo_p.h" #include "../../../network-settings.h" -#include QT_FORWARD_DECLARE_CLASS(QTcpSocket) class SocketPair; @@ -327,11 +325,6 @@ void tst_QTcpSocket::initTestCase_data() void tst_QTcpSocket::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::httpServerName(), 80)); QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpProxyServerName(), 3128)); diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 725f932868..8e7e1b463b 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include "private/qhostinfo_p.h" #include "private/qiodevice_p.h" // for QIODEVICE_BUFFERSIZE @@ -397,11 +396,6 @@ void tst_QSslSocket::initTestCase_data() void tst_QSslSocket::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."); testDataDir = QFileInfo(QFINDTESTDATA("certs")).absolutePath(); if (testDataDir.isEmpty()) testDataDir = QCoreApplication::applicationDirPath();