diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-04 14:43:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-04 18:46:06 +0200 |
| commit | 14a80bd4df83e960de458403deaf895a3d2c8812 (patch) | |
| tree | 1bf8a79b746378b14f64dbb32bb3bf5119d22f0c /tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | |
| parent | 3acd4b546ded7523f65d60cee6f3809113a91a16 (diff) | |
| parent | 39a290af6cea538dbbdb207d03d2af3602015c95 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp')
| -rw-r--r-- | tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index f01d79d9bc..23a1455571 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -576,6 +576,9 @@ protected: #ifndef QT_NO_PROCESS void tst_QTcpServer::addressReusable() { +#ifdef Q_OS_LINUX + QSKIP("The addressReusable test is unstable on Linux. See QTBUG-39985."); +#endif QFETCH_GLOBAL(bool, setProxy); if (setProxy) { #ifndef QT_NO_NETWORKPROXY |