diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2019-02-11 14:42:23 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-02-11 13:46:18 +0000 |
| commit | d8e1699fe1bd47deb3fa65551524b9cfd3afc356 (patch) | |
| tree | f48380ab08e39c02fbe99986e2ee3cc358b7090d | |
| parent | 16e945d7e14466f300f165ab8e8a38bfb35dc7f2 (diff) | |
Add support for $VERBOSE_TEST in the qml testrunner
Change-Id: I44d5b29a6513aa1a638b9fff8e2acfea21b7ce7d
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| -rw-r--r-- | src/main-lib/defaultconfiguration.cpp | 7 | ||||
| -rw-r--r-- | src/main-lib/defaultconfiguration.h | 2 | ||||
| -rw-r--r-- | src/tools/appman/appman.cpp | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/main-lib/defaultconfiguration.cpp b/src/main-lib/defaultconfiguration.cpp index 1cb13c34..c79da1d7 100644 --- a/src/main-lib/defaultconfiguration.cpp +++ b/src/main-lib/defaultconfiguration.cpp @@ -230,7 +230,12 @@ QStringList DefaultConfiguration::importPaths() const bool DefaultConfiguration::verbose() const { - return value<bool>("verbose"); + return value<bool>("verbose") || m_forceVerbose; +} + +void QtAM::DefaultConfiguration::setForceVerbose(bool forceVerbose) +{ + m_forceVerbose = forceVerbose; } bool DefaultConfiguration::slowAnimations() const diff --git a/src/main-lib/defaultconfiguration.h b/src/main-lib/defaultconfiguration.h index add29d59..7ab7d8a3 100644 --- a/src/main-lib/defaultconfiguration.h +++ b/src/main-lib/defaultconfiguration.h @@ -76,6 +76,7 @@ public: QString windowIcon() const; QStringList importPaths() const; bool verbose() const; + void setForceVerbose(bool forceVerbose); bool slowAnimations() const; bool loadDummyData() const; bool noSecurity() const; @@ -129,6 +130,7 @@ public: private: QString m_mainQmlFile; bool m_onlyOnePositionalArgument = false; + bool m_forceVerbose = false; }; QT_END_NAMESPACE_AM diff --git a/src/tools/appman/appman.cpp b/src/tools/appman/appman.cpp index 42ebb42b..0c9ed4de 100644 --- a/src/tools/appman/appman.cpp +++ b/src/tools/appman/appman.cpp @@ -104,6 +104,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) StartupTimer::instance()->checkpoint("after command line parse"); #if defined(AM_TESTRUNNER) TestRunner::initialize(cfg.testRunnerArguments()); + cfg.setForceVerbose(qEnvironmentVariableIsSet("VERBOSE_TEST")); + qInfo() << "Verbose mode is" << (cfg.verbose() ? "on" : "off") << "(changed by (un)setting $VERBOSE_TEST)"; #endif a.setup(&cfg, deploymentWarnings); #if defined(AM_TESTRUNNER) |