feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Move framework settings into framework manager

Browse Source 
Change-Id: I9914291adb102de5136802eb3b6d12afb6276538
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2016-10-05 12:39:23 +02:00
parent a6032652ef
commit 18dc7a5de9
25 changed files with 308 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/autotest/qtest/qttestconfiguration.cpp
View File

@@ -24,8 +24,10 @@
****************************************************************************/
#include "qttestconfiguration.h"
#include "qttestconstants.h"
#include "qttestoutputreader.h"
#include "../testsettings.h"
#include "qttestsettings.h"
#include "../testframeworkmanager.h"
namespace Autotest {
namespace Internal {
@@ -36,19 +38,26 @@ TestOutputReader *QtTestConfiguration::outputReader(const QFutureInterface<TestR
return new QtTestOutputReader(fi, app, buildDirectory());
}
QStringList QtTestConfiguration::argumentsForTestRunner(const TestSettings &settings) const
QStringList QtTestConfiguration::argumentsForTestRunner() const
{
QStringList arguments("-xml");
static const Core::Id id
= Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
const QString &metricsOption
= QtTestSettings::metricsTypeToOption(settings.qtTestSettings.metrics);
if (!metricsOption.isEmpty())
arguments << metricsOption;
QStringList arguments("-xml");
if (testCases().count())
arguments << testCases();
TestFrameworkManager *manager = TestFrameworkManager::instance();
auto qtSettings = qSharedPointerCast<QtTestSettings>(manager->settingsForTestFramework(id));
if (qtSettings.isNull())
return arguments;
const QString &metricsOption = QtTestSettings::metricsTypeToOption(qtSettings->metrics);
if (!metricsOption.isEmpty())
arguments << metricsOption;
if (runMode() == DebuggableTestConfiguration::Debug) {
if (settings.qtTestSettings.noCrashHandler)
if (qtSettings->noCrashHandler)
arguments << "-nocrashhandler";
}