diff options
Diffstat (limited to 'tests/benchmarks')
24 files changed, 17 insertions, 145 deletions
diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp index 24defc6b2f..995b606892 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp +++ b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp @@ -42,12 +42,6 @@ #include <QFile> #include <qtest.h> -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -// Application private dir is default serach path for files, so SRCDIR can be set to empty -#define SRCDIR "" -#endif - Q_DECLARE_METATYPE(QList<QByteArray>) Q_DECLARE_METATYPE(QTextCodec *) diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro index 75be7acf58..170d93ab0c 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro +++ b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro @@ -9,11 +9,6 @@ SOURCES += main.cpp wince*:{ DEFINES += SRCDIR=\\\"\\\" -} else:symbian* { - addFiles.files = utf-8.txt - addFiles.path = . - DEPLOYMENT += addFiles - TARGET.EPOCHEAPSIZE="0x100 0x1000000" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp index 0d0251f094..319b707948 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp @@ -73,7 +73,7 @@ private slots: void tst_qdiriterator::data() { -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QByteArray qtdir = qPrintable(QCoreApplication::applicationDirPath()); qtdir += "/depot"; #else diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index e6bd962302..a7400528e3 100755 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro @@ -12,12 +12,10 @@ QT -= gui CONFIG += release -SOURCES += main.cpp - -SOURCES += qfilesystemiterator.cpp +SOURCES += main.cpp qfilesystemiterator.cpp HEADERS += qfilesystemiterator.h -wince*|symbian: { +wince* { corelibdir.files = $$QT_SOURCE_TREE/src/corelib corelibdir.path = ./depot/src DEPLOYMENT += corelibdir diff --git a/tests/benchmarks/corelib/io/qfile/main.cpp b/tests/benchmarks/corelib/io/qfile/main.cpp index 621175178b..db240451fb 100644 --- a/tests/benchmarks/corelib/io/qfile/main.cpp +++ b/tests/benchmarks/corelib/io/qfile/main.cpp @@ -543,7 +543,7 @@ void tst_qfile::createSmallFiles() dir.cd("tst"); tmpDirName = dir.absolutePath(); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE) +#if defined(Q_WS_WINCE) for (int i = 0; i < 100; ++i) #else for (int i = 0; i < 1000; ++i) diff --git a/tests/benchmarks/corelib/io/qiodevice/main.cpp b/tests/benchmarks/corelib/io/qiodevice/main.cpp index c6b603c143..f9e04a2204 100644 --- a/tests/benchmarks/corelib/io/qiodevice/main.cpp +++ b/tests/benchmarks/corelib/io/qiodevice/main.cpp @@ -66,10 +66,8 @@ void tst_qiodevice::read_data() QTest::newRow("100k") << qint64(100 * 1024); QTest::newRow("1000k") << qint64(1000 * 1024); QTest::newRow("10000k") << qint64(10000 * 1024); -#ifndef Q_OS_SYMBIAN // Symbian devices don't (yet) have enough available RAM to run these QTest::newRow("100000k") << qint64(100000 * 1024); QTest::newRow("1000000k") << qint64(1000000 * 1024); -#endif } void tst_qiodevice::read_old() diff --git a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp index 05e184d0c2..54708f8639 100644 --- a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp @@ -44,26 +44,7 @@ #include <math.h> -#ifdef Q_OS_SYMBIAN -# include <e32std.h> -typedef RMutex NativeMutexType; -void NativeMutexInitialize(NativeMutexType *mutex) -{ - mutex->CreateLocal(); -} -void NativeMutexDestroy(NativeMutexType *mutex) -{ - mutex->Close(); -} -void NativeMutexLock(NativeMutexType *mutex) -{ - mutex->Wait(); -} -void NativeMutexUnlock(NativeMutexType *mutex) -{ - mutex->Signal(); -} -#elif defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) # include <pthread.h> # include <errno.h> typedef pthread_mutex_t NativeMutexType; diff --git a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp index c05fd8b685..ebcc0202ff 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp +++ b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp @@ -132,8 +132,8 @@ struct Large { // A "large" item type int x[1000]; }; -// Symbian devices typically have limited memory -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE) +// Embedded devices typically have limited memory +#if defined(Q_WS_WINCE) # define LARGE_MAX_SIZE 2000 #else # define LARGE_MAX_SIZE 20000 diff --git a/tests/benchmarks/corelib/tools/qbytearray/main.cpp b/tests/benchmarks/corelib/tools/qbytearray/main.cpp index 97ac57d53d..2c9b9d0638 100644 --- a/tests/benchmarks/corelib/tools/qbytearray/main.cpp +++ b/tests/benchmarks/corelib/tools/qbytearray/main.cpp @@ -73,11 +73,6 @@ void tst_qbytearray::append() { QFETCH(int, size); -#ifdef Q_OS_SYMBIAN - if (size > 1000000) - QSKIP("Skipped due to limited memory in many Symbian devices.", SkipSingle); -#endif - QByteArray ba; QBENCHMARK { QByteArray ba2(size, 'x'); diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 95aaad3a25..4d84451e39 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -42,12 +42,6 @@ #include <QFile> #include <QtTest/QtTest> -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -// Application private dir is default serach path for files, so SRCDIR can be set to empty -#define SRCDIR "" -#endif - #ifdef Q_OS_UNIX #include <sys/mman.h> #include <unistd.h> diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 3fd76ac63b..33240aef8d 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -10,11 +10,6 @@ SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp wince*:{ DEFINES += SRCDIR=\\\"\\\" -} else:symbian* { - addFiles.files = utf-8.txt - addFiles.path = . - DEPLOYMENT += addFiles - TARGET.EPOCHEAPSIZE="0x100 0x1000000" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro index f8df773442..c7df0ac160 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro @@ -8,5 +8,3 @@ CONFIG -= debug CONFIG += release QT -= gui SOURCES += main.cpp - -symbian: LIBS += -llibpthread diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp index a98dfea4ae..316dadd01b 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp @@ -322,7 +322,7 @@ void tst_GraphicsViewBenchmark::initTestCase() mMainView->resize(mSettings->size().width(), mSettings->size().height()); mMainView->show(); } else { -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) +#if defined(Q_WS_MAEMO_5) mMainView->showFullScreen(); #else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) { @@ -780,7 +780,7 @@ int main(int argc, char *argv[]) view.resize(settings.size().width(), settings.size().height()); view.show(); } else { -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) +#if defined(Q_WS_MAEMO_5) view.showFullScreen(); #else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) { diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro index 1d46ab9407..21b03f2a09 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro @@ -11,11 +11,3 @@ SOURCES += tst_qgraphicsview.cpp RESOURCES += qgraphicsview.qrc include(chiptester/chiptester.pri) - -symbian { - qt_not_deployed { - plugins.files = qjpeg.dll - plugins.path = imageformats - DEPLOYMENT += plugins - } -} diff --git a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp index 841036b8bc..f145304c14 100644 --- a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp +++ b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp @@ -161,17 +161,12 @@ void tst_QWidget::update_data() QTest::newRow("10x10x1 opaque") << 10 << 10 << 1 << true; QTest::newRow("10x10x10 opaque") << 10 << 10 << 10 << true; QTest::newRow("10x10x100 opaque") << 10 << 10 << 100 << true; -#ifndef Q_OS_SYMBIAN - //These test cases cause stack overflow in QWidgetPrivate::paintSiblingsRecursive - //see http://bugreports.qt.nokia.com/browse/QTBUG-8512 - //Symbian threads have a hard limit of 80kB user stack QTest::newRow("25x25x1 transparent ") << 25 << 25 << 1 << false; QTest::newRow("25x25x10 transparent") << 25 << 25 << 10 << false; QTest::newRow("25x25x100 transparent") << 25 << 25 << 100 << false; QTest::newRow("25x25x1 opaque") << 25 << 25 << 1 << true; QTest::newRow("25x25x10 opaque") << 25 << 25 << 10 << true; QTest::newRow("25x25x100 opaque") << 25 << 25 << 100 << true; -#endif } void tst_QWidget::update() diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp index 106247806d..f44a29d16d 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp @@ -166,13 +166,6 @@ void tst_qstylesheetstyle::grid() QFETCH(bool, show); QFETCH(int, N); -#ifdef Q_OS_SYMBIAN - // Symbian has limited stack (max 80k), which will run out when N >= 20 due to - // QWidget::show() using recursion among grid labels somewhere down the line. - if (show && N >= 20) - QSKIP("Grid too big for device to show", SkipSingle); -#endif - QWidget *w = new QWidget(); QGridLayout *layout = new QGridLayout(w); w->setLayout(layout); diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp index fcde5dfcaf..a7da42e347 100644 --- a/tests/benchmarks/gui/text/qtext/main.cpp +++ b/tests/benchmarks/gui/text/qtext/main.cpp @@ -51,12 +51,6 @@ #include <QBuffer> #include <qtest.h> -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -// Application private dir is default serach path for files, so SRCDIR can be set to empty -#define SRCDIR "" -#endif - Q_DECLARE_METATYPE(QTextDocument*) class tst_QText: public QObject @@ -141,11 +135,7 @@ void tst_QText::shaping_data() QTest::newRow("lorem") << m_lorem; QTest::newRow("short") << QString::fromLatin1("Lorem ipsum dolor sit amet"); -#if !defined(Q_OS_SYMBIAN) QFile file(QString::fromLatin1(SRCDIR) + QLatin1String("/bidi.txt")); -#else - QFile file( SRCDIR "bidi.txt" ); -#endif QVERIFY(file.open(QFile::ReadOnly)); QByteArray data = file.readAll(); QVERIFY(data.count() > 1000); diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro index b1daf69210..91368859b6 100644 --- a/tests/benchmarks/gui/text/qtext/qtext.pro +++ b/tests/benchmarks/gui/text/qtext/qtext.pro @@ -10,11 +10,4 @@ TARGET = tst_bench_QText SOURCES += main.cpp -symbian* { - TARGET.CAPABILITY = ALL -TCB - addFiles.files = bidi.txt - addFiles.path = . - DEPLOYMENT += addFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} +DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp index 464dd11034..54f0c71c1e 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp @@ -50,8 +50,6 @@ class qfile_vs_qnetworkaccessmanager : public QObject { Q_OBJECT - // do not use on symbian.. 100 MB is too large.. - // but.. this is a manual test anyway, so :) protected: void qnamFileRead_iteration(QNetworkAccessManager &manager, QNetworkRequest &request); void qnamImmediateFileRead_iteration(QNetworkAccessManager &manager, QNetworkRequest &request); @@ -77,11 +75,7 @@ void qfile_vs_qnetworkaccessmanager::initTestCase() { testFile.open(); QByteArray qba(1*1024*1024, 'x'); // 1 MB -#ifdef Q_OS_SYMBIAN - for (int i = 0; i < 10; i++) { // for Symbian only 10 MB -#else for (int i = 0; i < 100; i++) { -#endif testFile.write(qba); testFile.flush(); size += qba.size(); diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index ddbf6c40d0..3e1168e6fc 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp +++ b/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp @@ -111,11 +111,6 @@ void tst_qnetworkdiskcache::timeInsertion_data() QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); QTest::newRow("QDesktopServices Cache Location") << cacheLoc; -#ifdef Q_OS_SYMBIAN - if (QDir::drives().contains(QFileInfo("E:\\"))) - QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E")); -#endif - } //This functions times an insert() operation. @@ -177,11 +172,6 @@ void tst_qnetworkdiskcache::timeRead_data() QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); QTest::newRow("QDesktopServices Cache Location") << cacheLoc; -#ifdef Q_OS_SYMBIAN - if (QDir::drives().contains(QFileInfo("E:\\"))) - QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E")); -#endif - } //Times metadata as well payload lookup @@ -241,11 +231,6 @@ void tst_qnetworkdiskcache::timeRemoval_data() QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); QTest::newRow("QDesktopServices Cache Location") << cacheLoc; -#ifdef Q_OS_SYMBIAN - if (QDir::drives().contains(QFileInfo("E:\\"))) - QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E")); -#endif - } void tst_qnetworkdiskcache::timeRemoval() @@ -296,12 +281,8 @@ void tst_qnetworkdiskcache::timeExpiration_data() QString cacheLoc = QDesktopServices::storageLocation(QDesktopServices::CacheLocation); QTest::newRow("QDesktopServices Cache Location") << cacheLoc; -#ifdef Q_OS_SYMBIAN - if (QDir::drives().contains(QFileInfo("E:\\"))) - QTest::newRow("Symbian E: drive") << cacheLoc.replace(0, 1, QString("E")); -#endif - } + void tst_qnetworkdiskcache::timeExpiration() { diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp index d96b110d54..565bdd70fd 100644 --- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -559,8 +559,8 @@ void tst_qnetworkreply::uploadPerformance() void tst_qnetworkreply::httpUploadPerformance() { -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM) - // SHow some mercy for non-desktop platform/s +#if defined(Q_WS_WINCE_WM) + // Show some mercy for non-desktop platform/s enum {UploadSize = 4*1024*1024}; // 4 MB #else enum {UploadSize = 128*1024*1024}; // 128 MB @@ -630,7 +630,7 @@ void tst_qnetworkreply::httpDownloadPerformance() { QFETCH(bool, serverSendsContentLength); QFETCH(bool, chunkedEncoding); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM) +#if defined(Q_WS_WINCE_WM) // Show some mercy to non-desktop platform/s enum {UploadSize = 4*1024*1024}; // 4 MB #else @@ -714,7 +714,7 @@ void tst_qnetworkreply::httpDownloadPerformanceDownloadBuffer() QFETCH(HttpDownloadPerformanceDownloadBufferTestType, testType); // On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results. -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE_WM) +#if defined(Q_WS_WINCE_WM) // Show some mercy to non-desktop platform/s enum {UploadSize = 4*1024*1024}; // 4 MB #else diff --git a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp index f81853bfd6..abf4f14894 100644 --- a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -39,12 +39,8 @@ ** ****************************************************************************/ -// Just to get Q_OS_SYMBIAN -#include <qglobal.h> - #include <QtTest/QtTest> - - +#include <qglobal.h> #include <qcoreapplication.h> #include <qtcpsocket.h> #include <qtcpserver.h> @@ -84,7 +80,6 @@ private slots: tst_QTcpServer::tst_QTcpServer() { - Q_SET_DEFAULT_IAP } tst_QTcpServer::~tst_QTcpServer() @@ -179,9 +174,6 @@ void tst_QTcpServer::ipv6LoopbackPerformanceTest() QSKIP("WinCE WM: Not yet supported", SkipAll); #endif -#if defined(Q_OS_SYMBIAN) - QSKIP("Symbian: IPv6 is not yet supported", SkipAll); -#endif QTcpServer server; if (!server.listen(QHostAddress::LocalHostIPv6, 0)) { QVERIFY(server.serverError() == QAbstractSocket::UnsupportedSocketOperationError); diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp index 32a3ae3ee4..d65ca18e7e 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp +++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp @@ -48,10 +48,6 @@ #include <QImageReader> #include <QSize> -#if defined(Q_OS_SYMBIAN) -# define SRCDIR "" -#endif - class tst_jpeg : public QObject { Q_OBJECT diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro index 0b286743bd..f33cbf050e 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro +++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro @@ -12,9 +12,7 @@ CONFIG += release wince*: { DEFINES += SRCDIR=\\\"\\\" -} else:symbian { - # SRCDIR and SVGFILE defined in code in symbian -}else { +} else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } |