diff options
Diffstat (limited to 'tests/auto/corelib/kernel')
16 files changed, 11 insertions, 461 deletions
diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index e3c170a33b..e8f6bbac66 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -4,5 +4,3 @@ QT -= gui QT += network win32:!wince*:LIBS += -luser32 - -symbian:TARGET.CAPABILITY += NetworkServices diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index 6f8a75ed3d..10ed84750a 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -54,11 +54,6 @@ #include <QTcpServer> #include <QTcpSocket> -#ifdef Q_OS_SYMBIAN -#include <e32base.h> -#include <unistd.h> -#endif - #include "../../../../shared/util.h" //TESTED_CLASS= @@ -198,9 +193,6 @@ public slots: void cleanup(); private slots: // This test *must* run first. See the definition for why. - void onlySymbianActiveScheduler(); - void symbianNestedActiveSchedulerLoop_data(); - void symbianNestedActiveSchedulerLoop(); void processEvents(); void exec(); void throwInExec(); @@ -232,101 +224,6 @@ void tst_QEventLoop::init() void tst_QEventLoop::cleanup() { } -#ifdef Q_OS_SYMBIAN -class OnlySymbianActiveScheduler_helper : public QObject -{ - Q_OBJECT - -public: - OnlySymbianActiveScheduler_helper(int fd, QTimer *zeroTimer) - : fd(fd), - timerCount(0), - zeroTimer(zeroTimer), - zeroTimerCount(0), - notifierCount(0) - { - } - ~OnlySymbianActiveScheduler_helper() {} - -public slots: - void timerSlot() - { - // Let all the events occur twice so we know they reactivated after - // each occurrence. - if (++timerCount >= 2) { - // This will hopefully run last, so stop the active scheduler. - CActiveScheduler::Stop(); - } - } - void zeroTimerSlot() - { - if (++zeroTimerCount >= 2) { - zeroTimer->stop(); - } - } - void notifierSlot() - { - if (++notifierCount >= 2) { - char dummy; - ::read(fd, &dummy, 1); - } - } - -private: - int fd; - int timerCount; - QTimer *zeroTimer; - int zeroTimerCount; - int notifierCount; -}; -#endif - -void tst_QEventLoop::onlySymbianActiveScheduler() { -#ifndef Q_OS_SYMBIAN - QSKIP("This is a Symbian-only test.", SkipAll); -#else - // In here we try to use timers and sockets exclusively using the Symbian - // active scheduler and no processEvents(). - // This test should therefore be run first, so that we can verify that - // the first occurrence of processEvents does not do any initialization that - // we depend on. - - // Open up a pipe so we can test socket notifiers. - int pipeEnds[2]; - if (::pipe(pipeEnds) != 0) { - QFAIL("Could not open pipe"); - } - QSocketNotifier notifier(pipeEnds[0], QSocketNotifier::Read); - QSignalSpy notifierSpy(¬ifier, SIGNAL(activated(int))); - char dummy = 1; - ::write(pipeEnds[1], &dummy, 1); - - QTimer zeroTimer; - QSignalSpy zeroTimerSpy(&zeroTimer, SIGNAL(timeout())); - zeroTimer.setInterval(0); - zeroTimer.start(); - - QTimer timer; - QSignalSpy timerSpy(&timer, SIGNAL(timeout())); - timer.setInterval(2000); // Generous timeout or this test will fail if there is high load - timer.start(); - - OnlySymbianActiveScheduler_helper helper(pipeEnds[0], &zeroTimer); - connect(¬ifier, SIGNAL(activated(int)), &helper, SLOT(notifierSlot())); - connect(&zeroTimer, SIGNAL(timeout()), &helper, SLOT(zeroTimerSlot())); - connect(&timer, SIGNAL(timeout()), &helper, SLOT(timerSlot())); - - CActiveScheduler::Start(); - - ::close(pipeEnds[1]); - ::close(pipeEnds[0]); - - QCOMPARE(notifierSpy.count(), 2); - QCOMPARE(zeroTimerSpy.count(), 2); - QCOMPARE(timerSpy.count(), 2); -#endif -} - void tst_QEventLoop::processEvents() { QSignalSpy spy1(QAbstractEventDispatcher::instance(), SIGNAL(aboutToBlock())); @@ -379,13 +276,7 @@ void tst_QEventLoop::processEvents() killTimer(timerId); } -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) -// Symbian needs bit longer timeout for emulator, as emulator startup causes additional delay -# define EXEC_TIMEOUT 1000 -#else -# define EXEC_TIMEOUT 100 -#endif - +#define EXEC_TIMEOUT 100 void tst_QEventLoop::exec() { @@ -452,13 +343,10 @@ void tst_QEventLoop::throwInExec() { #if defined(QT_NO_EXCEPTIONS) || defined(NO_EVENTLOOP_EXCEPTIONS) QSKIP("Exceptions are disabled", SkipAll); -#elif defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN) +#elif defined(Q_OS_WINCE_WM) // Windows Mobile cannot handle cross library exceptions // qobject.cpp will try to rethrow the exception after handling // which causes gwes.exe to crash - - // Symbian doesn't propagate exceptions from eventloop, but converts them to - // CActiveScheduler errors instead -> this test will hang. QSKIP("This platform doesn't support propagating exceptions through the event loop", SkipAll); #elif defined(Q_OS_LINUX) // C++ exceptions can't be passed through glib callbacks. Skip the test if @@ -691,7 +579,7 @@ void tst_QEventLoop::processEventsExcludeTimers() // normal process events will send timers eventLoop.processEvents(QEventLoop::X11ExcludeTimers); -#if !defined(Q_OS_UNIX) || defined(Q_OS_SYMBIAN) +#if !defined(Q_OS_UNIX) QEXPECT_FAIL("", "X11ExcludeTimers only works on UN*X", Continue); #endif QCOMPARE(timerReceiver.gotTimerEvent, -1); @@ -703,164 +591,6 @@ void tst_QEventLoop::processEventsExcludeTimers() timerReceiver.gotTimerEvent = -1; } -#ifdef Q_OS_SYMBIAN -class DummyActiveObject : public CActive -{ -public: - DummyActiveObject(int levels); - ~DummyActiveObject(); - - void Start(); - -protected: - void DoCancel(); - void RunL(); - -public: - bool succeeded; - -private: - RTimer m_rTimer; - int remainingLevels; -}; - -class ActiveSchedulerLoop : public QObject -{ -public: - ActiveSchedulerLoop(int levels) : succeeded(false), timerId(-1), remainingLevels(levels) {} - ~ActiveSchedulerLoop() {} - - void timerEvent(QTimerEvent *e); - -public: - bool succeeded; - int timerId; - int remainingLevels; -}; - -DummyActiveObject::DummyActiveObject(int levels) - : CActive(CActive::EPriorityStandard), - succeeded(false), - remainingLevels(levels) -{ - m_rTimer.CreateLocal(); -} - -DummyActiveObject::~DummyActiveObject() -{ - Cancel(); - m_rTimer.Close(); -} - -void DummyActiveObject::DoCancel() -{ - m_rTimer.Cancel(); -} - -void DummyActiveObject::RunL() -{ - if (remainingLevels - 1 <= 0) { - ActiveSchedulerLoop loop(remainingLevels - 1); - loop.timerId = loop.startTimer(0); - QCoreApplication::processEvents(); - - succeeded = loop.succeeded; - } else { - succeeded = true; - } - CActiveScheduler::Stop(); -} - -void DummyActiveObject::Start() -{ - m_rTimer.After(iStatus, 100000); // 100 ms - SetActive(); -} - -void ActiveSchedulerLoop::timerEvent(QTimerEvent *e) -{ - Q_UNUSED(e); - DummyActiveObject *dummy = new(ELeave) DummyActiveObject(remainingLevels); - CActiveScheduler::Add(dummy); - - dummy->Start(); - - CActiveScheduler::Start(); - - succeeded = dummy->succeeded; - - delete dummy; - - killTimer(timerId); -} - -// We cannot trap panics when the test case fails, so run it in a different thread instead. -class ActiveSchedulerThread : public QThread -{ -public: - ActiveSchedulerThread(QEventLoop::ProcessEventsFlag flags); - ~ActiveSchedulerThread(); - -protected: - void run(); - -public: - volatile bool succeeded; - -private: - QEventLoop::ProcessEventsFlag m_flags; -}; - -ActiveSchedulerThread::ActiveSchedulerThread(QEventLoop::ProcessEventsFlag flags) - : succeeded(false), - m_flags(flags) -{ -} - -ActiveSchedulerThread::~ActiveSchedulerThread() -{ -} - -void ActiveSchedulerThread::run() -{ - ActiveSchedulerLoop loop(2); - loop.timerId = loop.startTimer(0); - // It may panic in here if the active scheduler and the Qt loop don't go together. - QCoreApplication::processEvents(m_flags); - - succeeded = loop.succeeded; -} -#endif // ifdef Q_OS_SYMBIAN - -void tst_QEventLoop::symbianNestedActiveSchedulerLoop_data() -{ - QTest::addColumn<int>("processEventFlags"); - - QTest::newRow("AllEvents") << (int)QEventLoop::AllEvents; - QTest::newRow("WaitForMoreEvents") << (int)QEventLoop::WaitForMoreEvents; -} - -/* - Before you start fiddling with this test, you should have a good understanding of how - Symbian active objects work. What the test does is to try to screw up the semaphore count - in the active scheduler to cause stray signals, by running the Qt event loop and the - active scheduler inside each other. Naturally, its attempts to do this should be futile! -*/ -void tst_QEventLoop::symbianNestedActiveSchedulerLoop() -{ -#ifndef Q_OS_SYMBIAN - QSKIP("This is a Symbian only test.", SkipAll); -#else - QFETCH(int, processEventFlags); - - ActiveSchedulerThread thread((QEventLoop::ProcessEventsFlag)processEventFlags); - thread.start(); - thread.wait(2000); - - QVERIFY(thread.succeeded); -#endif -} - Q_DECLARE_METATYPE(QThread*) namespace DeliverInDefinedOrder_QTBUG19637 { diff --git a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro index 97d55fcd4d..c44fa5a151 100644 --- a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro +++ b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro @@ -13,14 +13,3 @@ QT += widgets sql # plugFiles.path = sqldrivers # DEPLOYMENT += plugFiles #} - -symbian { - TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # // Min 1Mb, max 16Mb - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -} diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 2e2e58a90d..3ed3d25eeb 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -1323,7 +1323,7 @@ Q_DECLARE_METATYPE(PropertyObject::Priority) void tst_QObject::threadSignalEmissionCrash() { -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) int loopCount = 100; #else int loopCount = 1000; @@ -1577,17 +1577,8 @@ void tst_QObject::moveToThread() connect(object, SIGNAL(theSignal()), &thread, SLOT(quit()), Qt::DirectConnection); -#if defined(Q_OS_SYMBIAN) - // Child timer will be registered after parent timer in the new - // thread, and 10ms is less than symbian timer resolution, so - // child->timerEventThread compare after thread.wait() will - // usually fail unless timers are farther apart. - child->startTimer(100); - object->startTimer(150); -#else child->startTimer(90); object->startTimer(100); -#endif QCOMPARE(object->thread(), currentThread); QCOMPARE(child->thread(), currentThread); @@ -2815,9 +2806,7 @@ void tst_QObject::dynamicProperties() void tst_QObject::recursiveSignalEmission() { -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Emulator builds in Symbian do not support launching processes linking to Qt", SkipAll); -#elif defined(QT_NO_PROCESS) +#if defined(QT_NO_PROCESS) QSKIP("Test requires QProcess", SkipAll); #else QProcess proc; diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro index 29de071328..aac6bdc136 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.pro @@ -14,8 +14,3 @@ wince*: { addFiles.path = . DEPLOYMENT += addFiles } -symbian: { - addFiles.files = signalbug.exe - addFiles.path = \\sys\\bin - DEPLOYMENT += addFiles -} diff --git a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro index 0768c69caa..c1b316ef50 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro @@ -6,6 +6,4 @@ requires(contains(QT_CONFIG,private_tests)) include(../platformsocketengine/platformsocketengine.pri) -symbian: TARGET.CAPABILITY = NetworkServices - CONFIG += insignificant_test # QTBUG-21204 diff --git a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp index 2c3a6c52bf..d31ad64e09 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp +++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp @@ -49,13 +49,8 @@ #include <QtCore/QSocketNotifier> #include <QtNetwork/QTcpServer> #include <QtNetwork/QTcpSocket> -#ifdef Q_OS_SYMBIAN -#include <private/qsymbiansocketengine_p.h> -#define NATIVESOCKETENGINE QSymbianSocketEngine -#else #include <private/qnativesocketengine_p.h> #define NATIVESOCKETENGINE QNativeSocketEngine -#endif #ifdef Q_OS_UNIX #include <private/qnet_unix_p.h> #include <sys/select.h> @@ -129,9 +124,6 @@ signals: void tst_QSocketNotifier::unexpectedDisconnection() { -#ifdef Q_OS_SYMBIAN - QSKIP("Symbian socket engine pseudo descriptors can't be used for QSocketNotifier", SkipAll); -#else /* Given two sockets and two QSocketNotifiers registered on each their socket. If both sockets receive data, and the first slot @@ -201,7 +193,6 @@ void tst_QSocketNotifier::unexpectedDisconnection() writeEnd1->close(); writeEnd2->close(); server.close(); -#endif } class MixingWithTimersHelper : public QObject diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index a8ac799d73..d069cf162e 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -92,9 +92,6 @@ private slots: void QTBUG13633_dontBlockEvents(); void postedEventsShouldNotStarveTimers(); -#ifdef Q_OS_SYMBIAN - void handleLeaks(); -#endif }; class TimerHelper : public QObject @@ -169,13 +166,7 @@ void tst_QTimer::singleShotTimeout() QCOMPARE(helper.count, 1); } -#if defined(Q_OS_SYMBIAN) -// Increase wait as emulator startup can cause unexpected delays, and -// on hardware there are sometimes spikes right after process startup. -#define TIMEOUT_TIMEOUT 2000 -#else #define TIMEOUT_TIMEOUT 200 -#endif void tst_QTimer::timeout() { @@ -417,14 +408,8 @@ void tst_QTimer::deleteLaterOnQTimer() QVERIFY(pointer.isNull()); } -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) -// Increase wait as emulator startup can cause unexpected delays -#define MOVETOTHREAD_TIMEOUT 200 -#define MOVETOTHREAD_WAIT 5000 -#else #define MOVETOTHREAD_TIMEOUT 200 #define MOVETOTHREAD_WAIT 300 -#endif void tst_QTimer::moveToThread() { @@ -609,7 +594,7 @@ void tst_QTimer::cancelLongTimer() { QTimer timer; timer.setSingleShot(true); - timer.start(1000 * 60 * 60); //set timer for 1 hour (which would overflow Symbian RTimer) + timer.start(1000 * 60 * 60); //set timer for 1 hour QCoreApplication::processEvents(); QVERIFY(timer.isActive()); //if the timer completes immediately with an error, then this will fail timer.stop(); @@ -755,40 +740,5 @@ void tst_QTimer::postedEventsShouldNotStarveTimers() QVERIFY(timerHelper.count > 5); } -#ifdef Q_OS_SYMBIAN -void tst_QTimer::handleLeaks() -{ - const int timercount = 5; - int processhandles_start; - int threadhandles_start; - RThread().HandleCount(processhandles_start, threadhandles_start); - { - TimerHelper timerHelper; - QList<QTimer*> timers; - for (int i=0;i<timercount;i++) { - QTimer* timer = new QTimer; - timers.append(timer); - connect(timer, SIGNAL(timeout()), &timerHelper, SLOT(timeout())); - timer->setSingleShot(true); - timer->start(i); //test both zero and normal timeouts - } - int processhandles_mid; - int threadhandles_mid; - RThread().HandleCount(processhandles_mid, threadhandles_mid); - qDebug() << threadhandles_mid - threadhandles_start << "new thread owned handles"; - QTest::qWait(100); - QCOMPARE(timerHelper.count, timercount); - qDeleteAll(timers); - } - int processhandles_end; - int threadhandles_end; - RThread().HandleCount(processhandles_end, threadhandles_end); - QCOMPARE(threadhandles_end, threadhandles_start); //RTimer::CreateLocal creates a thread owned handle - //Can not verify process handles because QObject::connect may create up to 2 mutexes - //from a QMutexPool (4 process owned handles with open C imp.) - //QCOMPARE(processhandles_end, processhandles_start); -} -#endif - QTEST_MAIN(tst_QTimer) #include "tst_qtimer.moc" diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro index e3d99bb85c..2816bcdcef 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro @@ -7,7 +7,7 @@ mac:CONFIG -= app_bundle wince* { DEFINES += SRCDIR=\\\"\\\" -} else:!symbian { +} else { DEFINES += SRCDIR=\\\"$$PWD\\\" } diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp index 072b94f985..a15e806d49 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp @@ -46,13 +46,6 @@ //TESTED_CLASS= //TESTED_FILES= -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -// And underlying Open C have application private dir in default search path -#define SRCDIR "" -#endif - - #define EXISTING_SHARE "existing" class tst_QSystemLock : public QObject diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_unix.cpp index 984379619e..3ed8420e72 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_unix.cpp +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_unix.cpp @@ -63,25 +63,6 @@ union qt_semun { #define tr(x) QT_TRANSLATE_NOOP(QLatin1String("QSystemLock"), (x)) -#if defined(Q_OS_SYMBIAN) -int createUnixKeyFile(const QString &fileName) -{ - if (QFile::exists(fileName)) - return 0; - - int fd = open(QFile::encodeName(fileName).constData(), - O_EXCL | O_CREAT | O_RDWR, 0640); - if (-1 == fd) { - if (errno == EEXIST) - return 0; - return -1; - } else { - close(fd); - } - return 1; -} -#endif - QSystemLockPrivate::QSystemLockPrivate() : semaphore(-1), lockCount(0), error(QSystemLock::NoError), unix_key(-1), createdFile(false), createdSemaphore(false) @@ -125,11 +106,7 @@ key_t QSystemLockPrivate::handle() } // Create the file needed for ftok -#if defined(Q_OS_SYMBIAN) - int built = createUnixKeyFile(fileName); -#else int built = QSharedMemoryPrivate::createUnixKeyFile(fileName); -#endif if (-1 == built) return -1; createdFile = (1 == built); diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro index 50c266986c..c384e15f03 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro @@ -24,14 +24,6 @@ addFiles.files = $$OUT_PWD/../../lackey/lackey.exe ../../lackey/scripts addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\".\\\" -}else:symbian{ -requires(contains(QT_CONFIG,script)) -QT += gui script -addFiles.files = ../../lackey/scripts -addFiles.path = /data/qsharedmemorytemp/lackey -addBin.files = lackey.exe -addBin.path = /sys/bin -DEPLOYMENT += addFiles addBin } else { DEFINES += SRCDIR=\\\"$$PWD/../\\\" } diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp index 38c6f0e8ee..34374806b4 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp @@ -50,10 +50,7 @@ #define EXISTING_SHARE "existing" #define EXISTING_SIZE 1024 -#ifdef Q_OS_SYMBIAN -#define SRCDIR "c:/data/qsharedmemorytemp/lackey/" -#define LACKEYDIR SRCDIR "lackey" -#elif defined(Q_OS_WINCE) +#if defined(Q_OS_WINCE) #define LACKEYDIR SRCDIR #else #define LACKEYDIR "../lackey" @@ -434,9 +431,6 @@ void tst_QSharedMemory::readOnly() #ifdef Q_OS_WIN QSKIP("This test opens a crash dialog on Windows", SkipSingle); #endif -#if defined (Q_OS_SYMBIAN) - QSKIP("Readonly shared memory is not supported in symbian", SkipAll); -#endif QString program = LACKEYDIR "/lackey"; QStringList arguments; rememberKey("readonly_segfault"); @@ -559,9 +553,7 @@ void tst_QSharedMemory::simpleProducerConsumer() char *get = (char*)consumer.data(); // On Windows CE you always have ReadWrite access. Thus // ViewMapOfFile returns the same pointer - // On Symbian, the address will always be same, as - // write protection of chunks is not currently supported by Symbian -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) +#if !defined(Q_OS_WINCE) QVERIFY(put != get); #endif for (int i = 0; i < size; ++i) { @@ -643,10 +635,6 @@ public: QVERIFY(producer.isAttached()); char *memory = (char*)producer.data(); memory[1] = '0'; -#if defined(Q_OS_SYMBIAN) - // Sleep a while to ensure that consumers start properly - QTest::qSleep(1000); -#endif QTime timer; timer.start(); int i = 0; @@ -699,25 +687,12 @@ void tst_QSharedMemory::simpleThreadedProducerConsumer() #endif Producer p; -#if defined(Q_OS_SYMBIAN) - enum - { - /** - * The maximum stack size. - */ - SymbianStackSize = 0x14000 - }; - p.setStackSize(SymbianStackSize); -#endif if (producerIsThread) p.start(); QList<Consumer*> consumers; for (int i = 0; i < threads; ++i) { consumers.append(new Consumer()); -#if defined(Q_OS_SYMBIAN) - consumers.last()->setStackSize(SymbianStackSize); -#endif consumers.last()->start(); } @@ -746,9 +721,6 @@ void tst_QSharedMemory::simpleProcessProducerConsumer_data() */ void tst_QSharedMemory::simpleProcessProducerConsumer() { -#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll); -#endif QFETCH(int, processes); rememberKey("market"); diff --git a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro index e05b6b878b..c687e2d162 100644 --- a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro +++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro @@ -21,18 +21,3 @@ lackey.files = $$OUT_PWD/../lackey/lackey.exe ../lackey/scripts lackey.path = . DEPLOYMENT += lackey } - -symbian: { -requires(contains(QT_CONFIG,script)) -# this test calls lackey, which then again depends on QtScript. -# let's add it here so that it gets deployed easily -QT += script - -lackey.files = ../lackey/lackey.exe -lackey.path = /sys/bin -DEPLOYMENT += lackey - -# PowerMgmt capability needed to kill lackey process -TARGET.CAPABILITY = PowerMgmt -} - diff --git a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp index df625b8661..935f2f6041 100644 --- a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp +++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp @@ -188,9 +188,6 @@ void tst_QSystemSemaphore::complexacquire() void tst_QSystemSemaphore::basicProcesses() { -#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll); -#endif QSystemSemaphore sem("store", 0, QSystemSemaphore::Create); QStringList acquireArguments = QStringList() << acquire_js(); @@ -223,9 +220,6 @@ void tst_QSystemSemaphore::processes_data() void tst_QSystemSemaphore::processes() { -#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll); -#endif QSystemSemaphore sem("store", 1, QSystemSemaphore::Create); QFETCH(int, processes); @@ -265,7 +259,7 @@ void tst_QSystemSemaphore::processes() void tst_QSystemSemaphore::undo() { -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) QSKIP("This test only checks a unix behavior", SkipSingle); #endif @@ -287,9 +281,6 @@ void tst_QSystemSemaphore::undo() void tst_QSystemSemaphore::initialValue() { -#if defined (Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Cannot launch multiple Qt processes in Symbian emulator", SkipAll); -#endif QSystemSemaphore sem("store", 1, QSystemSemaphore::Create); QStringList acquireArguments = QStringList() << acquire_js(); diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro index 171216afb4..889ad0e3cc 100644 --- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro +++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro @@ -3,7 +3,7 @@ QT += widgets SOURCES += tst_qtranslator.cpp RESOURCES += qtranslator.qrc -wince*|symbian: { +wince* { addFiles.files = hellotr_la.qm msgfmt_from_po.qm addFiles.path = . DEPLOYMENT += addFiles |