summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qsocketnotifier
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2012-10-16 12:32:17 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-16 20:43:37 +0200
commitfdc9ce5908ee47f9f5adac2d49899a4de887ccd5 (patch)
treebb72388e5a6ca59915fcf18a7ae6b93aa9f01549 /tests/auto/corelib/kernel/qsocketnotifier
parent18a3ebe4e5999b4f01c3f006ae790dfe4bded3a3 (diff)
Test: remove QSKIP from tst_QSocketNotifier::posixSockets
Instead omit the whole test when Q_OS_UNIX is not defined. Change-Id: If0ee3345c25f6b1baa38845edfd08ec26a45d6f2 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qsocketnotifier')
-rw-r--r--tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
index 4a0fdad97c..bf745841c0 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -67,7 +67,9 @@ class tst_QSocketNotifier : public QObject
private slots:
void unexpectedDisconnection();
void mixingWithTimers();
+#ifdef Q_OS_UNIX
void posixSockets();
+#endif
};
class UnexpectedDisconnectTester : public QObject
@@ -240,11 +242,10 @@ void tst_QSocketNotifier::mixingWithTimers()
QTRY_COMPARE(helper.socketActivated, true);
}
+#ifdef Q_OS_UNIX
+// test only for posix
void tst_QSocketNotifier::posixSockets()
{
-#ifndef Q_OS_UNIX
- QSKIP("test only for posix");
-#else
QTcpServer server;
QVERIFY(server.listen(QHostAddress::LocalHost, 0));
@@ -299,8 +300,8 @@ void tst_QSocketNotifier::posixSockets()
QCOMPARE(passive->readAll(), QByteArray("goodbye",8));
}
qt_safe_close(posixSocket);
-#endif
}
+#endif
QTEST_MAIN(tst_QSocketNotifier)
#include <tst_qsocketnotifier.moc>