diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
| commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
| tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/qobjectrace | |
| parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) | |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qobjectrace')
| -rw-r--r-- | tests/auto/qobjectrace/tst_qobjectrace.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp index 1f52aecf8c..8cb7845e78 100644 --- a/tests/auto/qobjectrace/tst_qobjectrace.cpp +++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp @@ -45,9 +45,7 @@ enum { OneMinute = 60 * 1000, - TwoMinutes = OneMinute * 2, - TenMinutes = OneMinute * 10, - TwentyFiveMinutes = OneMinute * 25 }; + TwoMinutes = OneMinute * 2 }; class tst_QObjectRace: public QObject { @@ -139,11 +137,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 }; @@ -218,24 +211,11 @@ public: } }; -#if defined(Q_OS_SYMBIAN) -// Symbian needs "a bit" more time -# define EXTRA_THREAD_WAIT TenMinutes -# define MAIN_THREAD_WAIT TwentyFiveMinutes -#else -# define EXTRA_THREAD_WAIT 3000 -# define MAIN_THREAD_WAIT TwoMinutes -#endif +#define EXTRA_THREAD_WAIT 3000 +#define MAIN_THREAD_WAIT TwoMinutes 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 }; |