summaryrefslogtreecommitdiffstats
path: root/tests/auto/qlocalsocket
diff options
context:
space:
mode:
authorRitt Konstantin <qnx@ics.com>2011-06-21 11:51:10 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2011-06-21 12:05:43 (GMT)
commit71d5b43e80351dcfdc9502d3060f0af4676747d2 (patch)
treef7e30046ac933585948c28a778bda781bb29c6b9 /tests/auto/qlocalsocket
parent7657f6c1d9ee8b3c55eb291dda123565d45d645a (diff)
downloadQt-71d5b43e80351dcfdc9502d3060f0af4676747d2.zip
Qt-71d5b43e80351dcfdc9502d3060f0af4676747d2.tar.gz
Qt-71d5b43e80351dcfdc9502d3060f0af4676747d2.tar.bz2
skip two subtests that are known to fail on QNX
Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'tests/auto/qlocalsocket')
-rw-r--r--tests/auto/qlocalsocket/tst_qlocalsocket.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index 3dc5e73..feb2552 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -893,8 +893,8 @@ void tst_QLocalSocket::removeServer()
QLocalServer server, server2;
QVERIFY(QLocalServer::removeServer("cleanuptest"));
QVERIFY(server.listen("cleanuptest"));
-#ifndef Q_OS_WIN
- // on Windows, there can be several sockets listening on the same pipe
+#if !defined(Q_OS_WIN) && !defined(Q_OS_QNX)
+ // on Windows and QNX, there can be several sockets listening on the same pipe
// on Unix, there can only be one socket instance
QVERIFY(! server2.listen("cleanuptest"));
#endif