summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index cb5b3df9da..98ce112a9e 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -489,7 +489,8 @@ void tst_QTcpSocket::bind_data()
continue;
foreach (const QNetworkAddressEntry &entry, interface.addressEntries()) {
- if (entry.ip().isInSubnet(QHostAddress::parseSubnet("fe80::/10")))
+ if (entry.ip().isInSubnet(QHostAddress::parseSubnet("fe80::/10"))
+ || entry.ip().isInSubnet(QHostAddress::parseSubnet("169.254/16")))
continue; // link-local bind will fail, at least on Linux, so skip it.
QString ip(entry.ip().toString());
@@ -511,6 +512,9 @@ void tst_QTcpSocket::bind_data()
void tst_QTcpSocket::bind()
{
+ QFETCH_GLOBAL(bool, setProxy);
+ if (setProxy)
+ QSKIP("QTBUG-22964");
QFETCH(QString, stringAddr);
QFETCH(bool, successExpected);
QFETCH(QString, stringExpectedLocalAddress);