diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:18 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:18 +0200 |
| commit | 4f55c4181682538e6b1ac2609d907889ca14a02e (patch) | |
| tree | ac5f33586e3b3b8acab4a95efe1e16978a3e37b2 /tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | |
| parent | 457ab46936f4c90099a0f1b16abaff5312037fdb (diff) | |
| parent | 7a59d6f138ff8799170cc03d709525ab965d703a (diff) | |
Merge 5.14 into 5.14.1
Change-Id: Ie90edfd16f48e1907fd18288473ac403f62b9032
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 75b9b23259..0546c6ba7d 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -358,7 +358,8 @@ void tst_QTcpSocket::initTestCase() QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpServerName(), 21)); QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpProxyServerName(), 2121)); #else - QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); + if (!QtNetworkSettings::verifyTestNetworkSettings()) + QSKIP("No network test server available"); #endif } |