diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-11-14 15:28:39 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-14 15:49:43 +0100 |
| commit | 463c9999bb7840633cd36e756671d645f7a8e051 (patch) | |
| tree | 6558c9cda197c8b8a9108365f9aec7d79809e3ee /src | |
| parent | 2d1e1fb864d07578770176dca149d8bd2ac68bb7 (diff) | |
| download | qt-creator-463c9999bb7840633cd36e756671d645f7a8e051.tar.gz | |
Plugin tests: Fix '-test all'.
Change-Id: I97554a61d5f42bf46df30d003135d212fa353fb9
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/extensionsystem/pluginmanager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 349c36694b..46e6587c52 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -648,6 +648,8 @@ void PluginManager::startTests() { #ifdef WITH_TESTS foreach (PluginSpec *pluginSpec, d->testSpecs) { + if (!pluginSpec->plugin()) + continue; const QMetaObject *mo = pluginSpec->plugin()->metaObject(); QStringList methods; methods.append("arg0"); @@ -659,7 +661,10 @@ void PluginManager::startTests() methods.append(method.left(method.size()-2)); } } - QTest::qExec(pluginSpec->plugin(), methods); + // Don't run QTest::qExec with only one argument, that'd run + // *all* slots as tests. + if (methods.size() > 1) + QTest::qExec(pluginSpec->plugin(), methods); } if (!d->testSpecs.isEmpty()) QTimer::singleShot(1, QCoreApplication::instance(), SLOT(quit())); |