diff options
| author | Marko Kangas <marko.kangas@theqtcompany.com> | 2015-02-13 13:01:57 +0200 |
|---|---|---|
| committer | Marko Kangas <marko.kangas@theqtcompany.com> | 2015-03-16 09:34:15 +0000 |
| commit | bc69fd1dfe30876909091d93a07640a498a24c0c (patch) | |
| tree | 6af7b94832fcd5c596e54338266d43772ca152e6 /tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | |
| parent | f1b3244ac16cd5b306450c53fcbd4ee673bfe53b (diff) | |
Skip instead of entirely excluding tests with disabled features
Properly QSKIP tests that use disabled QProcess and symlink
features instead of excluding them silently by #ifdef.
Other reason is that moc doesn't respect QT_NO_* defines
in class definition which causes build issues on some
platforms.
Change-Id: I041020f7452f7d36c7ec8a5866a4ba5eb23d1f94
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
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, 4 insertions, 4 deletions
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 804f86b479..e0a6e3699d 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -96,9 +96,7 @@ private slots: void setSocketDescriptor(); #endif void listenWhileListening(); -#ifndef QT_NO_PROCESS void addressReusable(); -#endif void setNewSocketDescriptorBlocking(); #ifndef QT_NO_NETWORKPROXY void invalidProxy_data(); @@ -565,9 +563,11 @@ protected: #endif // !Q_OS_WINRT }; -#ifndef QT_NO_PROCESS void tst_QTcpServer::addressReusable() { +#ifdef QT_NO_PROCESS + QSKIP("No qprocess support", SkipAll); +#else #ifdef Q_OS_LINUX QSKIP("The addressReusable test is unstable on Linux. See QTBUG-39985."); #endif @@ -616,8 +616,8 @@ void tst_QTcpServer::addressReusable() QTcpServer server; QVERIFY(server.listen(QHostAddress::LocalHost, 49199)); -} #endif +} void tst_QTcpServer::setNewSocketDescriptorBlocking() { |