summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2011-09-29 13:54:27 (GMT)
committermread <qt-info@nokia.com>2011-09-29 14:02:16 (GMT)
commitc4699f8940d4bb0ecd462f323c6acc3619b15b1c (patch)
treedf7eb6171ca917d88b01c80e4d808b468afffaa7 /tests/auto
parent783f1de86112745eb4fca3bb0a8d75a4197a70c9 (diff)
downloadQt-c4699f8940d4bb0ecd462f323c6acc3619b15b1c.zip
Qt-c4699f8940d4bb0ecd462f323c6acc3619b15b1c.tar.gz
Qt-c4699f8940d4bb0ecd462f323c6acc3619b15b1c.tar.bz2
QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8
tst_qobjectrace had some of its tests disabled for Symbian builds because they were not working with Symbian's event dispatcher. Retesting with Qt 4.8, which has a new event dispatcher, shows that they are now working. The tests are re-enabled again. They ran successfully on E7, N8 and emulator many times without crashing. Task-number: QTBUG-9113 Reviewed-by: Shane Kearns
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qobjectrace/tst_qobjectrace.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp
index 1f52aec..f9ec6ce 100644
--- a/tests/auto/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp
@@ -139,11 +139,6 @@ private slots:
void tst_QObjectRace::moveToThreadRace()
{
-#if defined(Q_OS_SYMBIAN)
- // ### 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
RaceObject *object = new RaceObject;
enum { ThreadCount = 6 };
@@ -229,13 +224,6 @@ public:
void tst_QObjectRace::destroyRace()
{
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
- // ### 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
-
enum { ThreadCount = 10, ObjectCountPerThread = 733,
ObjectCount = ThreadCount * ObjectCountPerThread };