diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2013-06-06 13:09:21 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2013-06-20 11:21:00 +0200 |
| commit | 440725322abf0189c0cb28baddebe76bc26c5f05 (patch) | |
| tree | 93d4f15567d476dd987c5a0219d796cacd83404b | |
| parent | 5c4a1a12638b90ad817ce863b983c4c7d4c87066 (diff) | |
| download | qt-creator-440725322abf0189c0cb28baddebe76bc26c5f05.tar.gz | |
Tests: Allow execution from outside pluginmanager folder
Change-Id: If8d564b9fe125669aa179f2b21de8ffac16cd076
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | tests/auto/extensionsystem/pluginmanager/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/test.pro b/tests/auto/extensionsystem/pluginmanager/test.pro index b0ef1c56a4..4fe9054eda 100644 --- a/tests/auto/extensionsystem/pluginmanager/test.pro +++ b/tests/auto/extensionsystem/pluginmanager/test.pro @@ -14,3 +14,5 @@ OTHER_FILES = $$PWD/plugins/otherplugin.xml \ COPYDIR = $$OUT_PWD COPYFILES = $$OTHER_FILES include(../copy.pri) + +DEFINES += "PLUGINMANAGER_TESTS_DIR=\\\"$$OUT_PWD\\\"" diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp index f790e2697c..284f3ecb80 100644 --- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp +++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp @@ -75,6 +75,11 @@ class MyClass11 : public MyClass1 Q_OBJECT }; +static QString pluginFolder(const QLatin1String &folder) +{ + return QLatin1String(PLUGINMANAGER_TESTS_DIR) + QLatin1String("/") + folder; +} + void tst_PluginManager::init() { m_pm = new PluginManager; @@ -176,7 +181,7 @@ void tst_PluginManager::getObjects() void tst_PluginManager::plugins() { - m_pm->setPluginPaths(QStringList() << "plugins"); + m_pm->setPluginPaths(QStringList() << pluginFolder(QLatin1String("plugins"))); QCOMPARE(m_pluginsChanged->count(), 1); QList<PluginSpec *> plugins = m_pm->plugins(); QCOMPARE(plugins.count(), 3); @@ -194,7 +199,7 @@ void tst_PluginManager::plugins() void tst_PluginManager::circularPlugins() { - m_pm->setPluginPaths(QStringList() << "circularplugins"); + m_pm->setPluginPaths(QStringList() << pluginFolder(QLatin1String("circularplugins"))); m_pm->loadPlugins(); foreach (PluginSpec *spec, m_pm->plugins()) { if (spec->name() == "plugin1") { @@ -215,7 +220,7 @@ void tst_PluginManager::circularPlugins() void tst_PluginManager::correctPlugins1() { m_pm->setFileExtension("spec"); - m_pm->setPluginPaths(QStringList() << "correctplugins1"); + m_pm->setPluginPaths(QStringList() << pluginFolder(QLatin1String("correctplugins1"))); m_pm->loadPlugins(); foreach (PluginSpec *spec, m_pm->plugins()) { if (spec->hasError()) |