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

AutoTest: Use StandardRunnable inside TestConfiguration

Browse Source 
Replace some members by a single one.
By using the StandardRunnable we automatically get more
information that can be used later (arguments, device).

Change-Id: Id2afb6dffc27d97da568372f6ee13c7181fc393a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Christian Stenger
2017-08-31 11:26:02 +02:00
parent 2edbefcb5d
commit 1acf748f5f
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/autotest/testconfiguration.h
View File

@@ -28,6 +28,7 @@
#include "autotestconstants.h"
#include <projectexplorer/project.h>
#include <projectexplorer/runnables.h>
#include <utils/environment.h>
#include <QFutureInterface>
@@ -75,7 +76,7 @@ public:
QString buildDirectory() const { return m_buildDir; }
QString projectFile() const { return m_projectFile; }
QString displayName() const { return m_displayName; }
Utils::Environment environment() const { return m_environment; }
Utils::Environment environment() const { return m_runnable.environment; }
ProjectExplorer::Project *project() const { return m_project.data(); }
TestRunConfiguration *runConfiguration() const { return m_runConfig; }
bool isGuessed() const { return m_guessedConfiguration; }
@@ -90,16 +91,14 @@ private:
QStringList m_testCases;
int m_testCaseCount = 0;
QString m_projectFile;
QString m_executableFile;
QString m_workingDir;
QString m_buildDir;
QString m_displayName;
QString m_guessedFrom;
Utils::Environment m_environment;
QPointer<ProjectExplorer::Project> m_project;
bool m_guessedConfiguration = false;
TestRunConfiguration *m_runConfig = 0;
QSet<QString> m_buildTargets;
ProjectExplorer::StandardRunnable m_runnable;
};
class DebuggableTestConfiguration : public TestConfiguration