diff options
Diffstat (limited to 'tests/auto/network/socket/platformsocketengine')
-rw-r--r-- | tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp index 4638e33ee0..103ea1323e 100644 --- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp +++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp @@ -85,9 +85,7 @@ private slots: void simpleConnectToIMAP(); void udpLoopbackTest(); void udpIPv6LoopbackTest(); -#ifndef Q_OS_AIX void broadcastTest(); -#endif void serverTest(); void udpLoopbackPerformance(); void tcpLoopbackPerformance(); @@ -97,9 +95,7 @@ private slots: void setSocketDescriptor(); void invalidSend(); void receiveUrgentData(); -#ifndef Q_OS_WIN void tooManySockets(); -#endif }; tst_PlatformSocketEngine::tst_PlatformSocketEngine() @@ -300,10 +296,11 @@ void tst_PlatformSocketEngine::udpIPv6LoopbackTest() } //--------------------------------------------------------------------------- - -#ifndef Q_OS_AIX void tst_PlatformSocketEngine::broadcastTest() { +#ifdef Q_OS_AIX + QSKIP("Broadcast does not work on darko"); +#endif PLATFORMSOCKETENGINE broadcastSocket; // Initialize a regular Udp socket @@ -338,8 +335,8 @@ void tst_PlatformSocketEngine::broadcastTest() QVERIFY(broadcastSocket.readDatagram(response.data(), response.size()) == response.size()); QCOMPARE(response, trollMessage); + } -#endif //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::serverTest() @@ -532,11 +529,11 @@ void tst_PlatformSocketEngine::readWriteBufferSize() } //--------------------------------------------------------------------------- - -// Certain windows machines suffocate and spend too much time in this test. -#ifndef Q_OS_WIN void tst_PlatformSocketEngine::tooManySockets() { +#if defined Q_OS_WIN + QSKIP("Certain windows machines suffocate and spend too much time in this test."); +#endif QList<PLATFORMSOCKETENGINE *> sockets; PLATFORMSOCKETENGINE *socketLayer = 0; for (;;) { @@ -551,7 +548,6 @@ void tst_PlatformSocketEngine::tooManySockets() qDeleteAll(sockets); } -#endif //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::bind() |