diff options
| author | Ritt Konstantin <qnx@ics.com> | 2011-06-21 11:51:10 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-06-21 12:05:43 (GMT) |
| commit | 71d5b43e80351dcfdc9502d3060f0af4676747d2 (patch) | |
| tree | f7e30046ac933585948c28a778bda781bb29c6b9 | |
| parent | 7657f6c1d9ee8b3c55eb291dda123565d45d645a (diff) | |
| download | Qt-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>
| -rw-r--r-- | tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qpluginloader/tst_qpluginloader.cpp | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp index 76dbd48..d2d92a5 100644 --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp @@ -219,7 +219,7 @@ void tst_QPluginLoader::errorString() QVERIFY(loader.errorString() != unknown); } -#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX && !defined Q_OS_SYMBIAN +#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX && !defined Q_OS_SYMBIAN && !defined Q_OS_QNX { QPluginLoader loader( sys_qualifiedLibraryName("almostplugin")); //a plugin with unresolved symbols loader.setLoadHints(QLibrary::ResolveAllSymbolsHint); |