summaryrefslogtreecommitdiffstats
path: root/tests/auto/qobjectrace/tst_qobjectrace.cpp
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-06 06:23:07 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-06 06:23:07 (GMT)
commit57ceb11ecf95032418712a686418116cf2398e7a (patch)
tree378533fcc07983d3a1b461aaaad07d842e50b81c /tests/auto/qobjectrace/tst_qobjectrace.cpp
parent90d4366f1e9657b3240a872698614c7d9747f9e0 (diff)
parenta4fc85c75f068b73f9c2334c77b0ae2275510e17 (diff)
downloadQt-57ceb11ecf95032418712a686418116cf2398e7a.zip
Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.gz
Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.bz2
Merge commit 'origin/master'
Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
Diffstat (limited to 'tests/auto/qobjectrace/tst_qobjectrace.cpp')
-rw-r--r--tests/auto/qobjectrace/tst_qobjectrace.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp
index 1bd09cd..1736d0b 100644
--- a/tests/auto/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp
@@ -44,8 +44,8 @@
#include <QtTest/QtTest>
-enum { OneMinute = 60 * 1000,
- TwoMinutes = OneMinute * 2,
+enum { OneMinute = 60 * 1000,
+ TwoMinutes = OneMinute * 2,
TenMinutes = OneMinute * 10,
TwentyFiveMinutes = OneMinute * 25 };
@@ -143,7 +143,7 @@ void tst_QObjectRace::moveToThreadRace()
// ### FIXME: task 257411 - remove xfail once this is fixed
QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race, see task: 257411", Abort);
QVERIFY(false);
-#endif
+#endif
RaceObject *object = new RaceObject;
enum { ThreadCount = 6 };
@@ -222,7 +222,7 @@ public:
// Symbian needs "a bit" more time
# define EXTRA_THREAD_WAIT TenMinutes
# define MAIN_THREAD_WAIT TwentyFiveMinutes
-#else
+#else
# define EXTRA_THREAD_WAIT 3000
# define MAIN_THREAD_WAIT TwoMinutes
#endif
@@ -230,13 +230,13 @@ public:
void tst_QObjectRace::destroyRace()
{
#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
- // ### FIXME: task 257411 - remove xfail once this is fixed.
+ // ### FIXME: task 257411 - remove xfail once this is fixed.
// Oddly enough, this seems to work properly in HW, if given enough time and memory.
QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race on emulator, see task: 257411", Abort);
QVERIFY(false);
-#endif
+#endif
- enum { ThreadCount = 10, ObjectCountPerThread = 733,
+ enum { ThreadCount = 10, ObjectCountPerThread = 733,
ObjectCount = ThreadCount * ObjectCountPerThread };
const char *_slots[] = { SLOT(slot1()) , SLOT(slot2()) , SLOT(slot3()),