summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>2012-08-15 12:04:35 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-15 15:19:55 +0200
commit555e4e05f4f98f524e108fba0fb236406f2e2b2f (patch)
tree326e38624537b44f76b7ae2d2314e31ba8b2d79c /tests
parentda64a5079249ec04e4d3d6df2cc87ee69f66b977 (diff)
Fix tst_qbytearray on QNX
qUncompressCorruptedData() no longer hangs on QNX 650 and Blackberry OS sytems. Change-Id: Id131f9f1c6dcd358c152675c7e29ab937052c1d0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index aa17a499a1..a28bc8172e 100644
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -307,11 +307,11 @@ void tst_QByteArray::qUncompressCorruptedData_data()
}
// Corrupt data causes this test to lock up on HP-UX / PA-RISC with gcc,
-// SOLARIS, QNX and Windows.
+// SOLARIS, and Windows.
// This test is expected to produce some warning messages in the test output.
void tst_QByteArray::qUncompressCorruptedData()
{
-#if !(defined(Q_OS_HPUX) && !defined(__ia64) && defined(Q_CC_GNU)) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_QNX) && !defined(Q_OS_WIN)
+#if !(defined(Q_OS_HPUX) && !defined(__ia64) && defined(Q_CC_GNU)) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_WIN)
QFETCH(QByteArray, in);
QByteArray res;
@@ -1904,5 +1904,5 @@ void tst_QByteArray::literals()
const char globalChar = '1';
-QTEST_APPLESS_MAIN(tst_QByteArray)
+QTEST_MAIN(tst_QByteArray)
#include "tst_qbytearray.moc"