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>

1 files changed, 2 insertions, 59 deletions

diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index 76dbd48a14..5a4db8ac4c 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
@@ -87,12 +87,6 @@
 # endif
 # define PREFIX         ""
 
-#elif defined(Q_OS_SYMBIAN)
-# undef dll_VALID
-# define dll_VALID      true
-# define SUFFIX         ".dll"
-# define PREFIX         ""
-
 #else  // all other Unix
 # undef so_VALID
 # define so_VALID       true
@@ -122,7 +116,6 @@ private slots:
     void errorString();
     void loadHints();
     void deleteinstanceOnUnload();
-    void checkingStubsFromDifferentDrives();
     void loadDebugObj();
     void loadCorruptElf();
     void loadGarbage();
@@ -219,7 +212,7 @@ void tst_QPluginLoader::errorString()
     QVERIFY(loader.errorString() != unknown);
     }
 
-#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX && !defined Q_OS_SYMBIAN
+#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX
     {
     QPluginLoader loader( sys_qualifiedLibraryName("almostplugin"));     //a plugin with unresolved symbols
     loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
@@ -303,56 +296,6 @@ void tst_QPluginLoader::deleteinstanceOnUnload()
     }
 }
 
-void tst_QPluginLoader::checkingStubsFromDifferentDrives()
-{
-#if defined(Q_OS_SYMBIAN)
-
-    // This test needs C-drive + some additional drive (driveForStubs)
-
-    const QString driveForStubs("E:/");// != "C:/"
-    const QString stubDir("system/temp/stubtest/");
-    const QString stubName("dummyStub.qtplugin");
-    const QString fullStubFileName(stubDir + stubName);
-    QDir dir(driveForStubs);
-    bool test1(false); bool test2(false);
-
-    // initial clean up
-    QFile::remove(driveForStubs + fullStubFileName);
-    dir.rmdir(driveForStubs + stubDir);
-
-    // create a stub dir and do stub drive check
-    if (!dir.mkpath(stubDir))
-        QSKIP("Required drive not available for this test", SkipSingle);
-
-    {// test without stub, should not be found
-    QPluginLoader loader("C:/" + fullStubFileName);
-    test1 = !loader.fileName().length();
-    }
-
-    // create a stub to defined drive
-    QFile tempFile(driveForStubs + fullStubFileName);
-    tempFile.open(QIODevice::ReadWrite);
-    QFileInfo fileInfo(tempFile);
-
-    {// now should be found even tried to find from C:
-    QPluginLoader loader("C:/" + fullStubFileName);
-    test2 = (loader.fileName() == fileInfo.absoluteFilePath());
-    }
-
-    // clean up
-    tempFile.close();
-    if (!QFile::remove(driveForStubs + fullStubFileName))
-        QWARN("Could not remove stub file");
-    if (!dir.rmdir(driveForStubs + stubDir))
-        QWARN("Could not remove stub directory");
-
-    // test after cleanup
-    QVERIFY(test1);
-    QVERIFY(test2);
-
-#endif//Q_OS_SYMBIAN
-}
-
 void tst_QPluginLoader::loadDebugObj()
 {
 #if defined (__ELF__)
@@ -391,7 +334,7 @@ if (sizeof(void*) == 8) {
 
 void tst_QPluginLoader::loadGarbage()
 {
-#if defined (Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+#if defined (Q_OS_UNIX)
     for (int i=0; i<5; i++) {
         QPluginLoader lib(QString(SRCDIR "elftest/garbage%1.so").arg(i));
         QCOMPARE(lib.load(), false);