diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-24 10:36:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 09:12:52 +0100 |
| commit | 3385fb91e1e55e1bfa1f78dfb8ce2e9f3fdaedef (patch) | |
| tree | b77bb527bf3a21dc95a317248b2640c73751f629 /tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp | |
| parent | 13eba9ddf47d570fc4562c20fcfbacd1dfa4a61a (diff) | |
Fixed installation of corelib tests
In .pro files, removed wince/symbian-specific DEPLOYMENT cases and
replaced them with TESTDATA where appropriate.
In .cpp files, removed SRCDIR and relative paths to testdata and
replaced them with the QFINDTESTDATA macro where appropriate.
Modified test helper apps/libs to install themselves under the test
they relate to.
This change allows corelib tests to be correctly installed, along with
their testdata, via `make install'.
Change-Id: I5e202e2f3b577af7e39072d5c9fe13e0ca125304
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp')
| -rw-r--r-- | tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp index a874324c60..4b1ed7199d 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp @@ -95,8 +95,7 @@ static QString sys_qualifiedLibraryName(const QString &fileName) { - QString currDir = QDir::currentPath(); - return currDir + "/bin/" + PREFIX + fileName + SUFFIX; + return QFINDTESTDATA(QString("bin/%1%2%3").arg(PREFIX).arg(fileName).arg(SUFFIX)); } //TESTED_CLASS= @@ -249,8 +248,8 @@ void tst_QPluginLoader::deleteinstanceOnUnload() void tst_QPluginLoader::loadDebugObj() { #if defined (__ELF__) - QVERIFY(QFile::exists(SRCDIR "elftest/debugobj.so")); - QPluginLoader lib1(SRCDIR "elftest/debugobj.so"); + QVERIFY(QFile::exists(QFINDTESTDATA("elftest/debugobj.so"))); + QPluginLoader lib1(QFINDTESTDATA("elftest/debugobj.so")); QCOMPARE(lib1.load(), false); #endif } @@ -259,21 +258,21 @@ void tst_QPluginLoader::loadCorruptElf() { #if defined (__ELF__) if (sizeof(void*) == 8) { - QVERIFY(QFile::exists(SRCDIR "elftest/corrupt1.elf64.so")); + QVERIFY(QFile::exists(QFINDTESTDATA("elftest/corrupt1.elf64.so"))); - QPluginLoader lib1(SRCDIR "elftest/corrupt1.elf64.so"); + QPluginLoader lib1(QFINDTESTDATA("elftest/corrupt1.elf64.so")); QCOMPARE(lib1.load(), false); QVERIFY2(lib1.errorString().contains("not an ELF object"), qPrintable(lib1.errorString())); - QPluginLoader lib2(SRCDIR "elftest/corrupt2.elf64.so"); + QPluginLoader lib2(QFINDTESTDATA("elftest/corrupt2.elf64.so")); QCOMPARE(lib2.load(), false); QVERIFY2(lib2.errorString().contains("invalid"), qPrintable(lib2.errorString())); - QPluginLoader lib3(SRCDIR "elftest/corrupt3.elf64.so"); + QPluginLoader lib3(QFINDTESTDATA("elftest/corrupt3.elf64.so")); QCOMPARE(lib3.load(), false); QVERIFY2(lib3.errorString().contains("invalid"), qPrintable(lib3.errorString())); } else if (sizeof(void*) == 4) { - QPluginLoader libW(SRCDIR "elftest/corrupt3.elf64.so"); + QPluginLoader libW(QFINDTESTDATA("elftest/corrupt3.elf64.so")); QCOMPARE(libW.load(), false); QVERIFY2(libW.errorString().contains("architecture"), qPrintable(libW.errorString())); } else { @@ -286,12 +285,12 @@ void tst_QPluginLoader::loadGarbage() { #if defined (Q_OS_UNIX) for (int i=0; i<5; i++) { - QPluginLoader lib(QString(SRCDIR "elftest/garbage%1.so").arg(i)); + QPluginLoader lib(QFINDTESTDATA(QString("elftest/garbage%1.so").arg(i))); QCOMPARE(lib.load(), false); QVERIFY(lib.errorString() != QString("Unknown error")); } #endif } -QTEST_APPLESS_MAIN(tst_QPluginLoader) +QTEST_MAIN(tst_QPluginLoader) #include "tst_qpluginloader.moc" |