From 5838874b1d1f10fb027d8f923e84b24675918a37 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 22 Jun 2016 13:03:00 +0200 Subject: [PATCH] Plugin Tests: Make 'all' override previous args, and give sensible order If you write "all" it should mean "all", and "load" order makes more sense than "alphabetic". Change-Id: If90b665d714efaf0919ad418fbbe02c50a0fced2 Reviewed-by: Christian Stenger Reviewed-by: Nikolai Kosjar --- src/libs/extensionsystem/optionsparser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index a7b91de70be..852df2863d8 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/src/libs/extensionsystem/optionsparser.cpp @@ -112,10 +112,10 @@ bool OptionsParser::checkForTestOptions() if (m_currentArg == QLatin1String(TEST_OPTION)) { if (nextToken(RequiredToken)) { if (m_currentArg == QLatin1String("all")) { - foreach (PluginSpec *spec, m_pmPrivate->pluginSpecs) { - if (spec && !m_pmPrivate->containsTestSpec(spec)) - m_pmPrivate->testSpecs.append(PluginManagerPrivate::TestSpec(spec)); - } + m_pmPrivate->testSpecs = + Utils::transform(m_pmPrivate->loadQueue(), [](PluginSpec *spec) { + return PluginManagerPrivate::TestSpec(spec); + }); } else { QStringList args = m_currentArg.split(QLatin1Char(',')); const QString pluginName = args.takeFirst();