Fix qml autotest

debugApplication is supposed to return an error in the single-process
case. This is now tested.

Refactored "Main" to properly set the buildConfig for the testrunner.

Change-Id: If0af720a85345258246dc9b09182c4fffab894f6
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

4 files changed, 7 insertions, 5 deletions

diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index a7346df0..2b70c4d7 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -222,9 +222,6 @@ void Main::setup(const DefaultConfiguration *cfg) Q_DECL_NOEXCEPT_EXPR(false)
     setupQmlEngine(cfg->importPaths(), cfg->style());
     setupWindowTitle(QString(), cfg->windowIcon());
     setupWindowManager(cfg->waylandSocketName(), cfg->slowAnimations(), cfg->noUiWatchdog());
-    loadQml(cfg->loadDummyData());
-    // --no-fullscreen on the command line trumps the fullscreen setting in the config file
-    showWindow(cfg->fullscreen() && !cfg->noFullscreen());
     setupShellServer(cfg->telnetAddress(), cfg->telnetPort());
     setupSSDPService();
 }
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index 587ab6db..ba1aa800 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -88,6 +88,8 @@ public:
     bool isSingleProcessMode() const;
 
     void setup(const DefaultConfiguration *cfg) Q_DECL_NOEXCEPT_EXPR(false);
+    void loadQml(bool loadDummyData) Q_DECL_NOEXCEPT_EXPR(false);
+    void showWindow(bool showFullscreen);
 
     void shutDown();
 
@@ -117,8 +119,6 @@ protected:
     void setupWindowTitle(const QString &title, const QString &iconPath);
     void setupWindowManager(const QString &waylandSocketName, bool slowAnimations, bool uiWatchdog);
 
-    void loadQml(bool loadDummyData) Q_DECL_NOEXCEPT_EXPR(false);
-    void showWindow(bool showFullscreen);
     void setupShellServer(const QString &telnetAddress, quint16 telnetPort) Q_DECL_NOEXCEPT_EXPR(false);
     void setupSSDPService() Q_DECL_NOEXCEPT_EXPR(false);
 
diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp
index 93f4473d..b5f42b36 100644
--- a/src/manager-lib/applicationmanager.cpp
+++ b/src/manager-lib/applicationmanager.cpp
@@ -639,6 +639,9 @@ bool ApplicationManager::startApplication(const Application *app, const QString
     QStringList debugWrapperCommand;
     QMap<QString, QString> debugEnvironmentVariables;
     if (!debugWrapperSpecification.isEmpty()) {
+        if (isSingleProcess())
+            throw Exception("Using debug-wrappers is not supported in the single-process mode.");
+
         if (!DebugWrapper::parseSpecification(debugWrapperSpecification, debugWrapperCommand,
                                               debugEnvironmentVariables)) {
             throw Exception("Tried to start application %1 using an invalid debug-wrapper specification: %2")
diff --git a/src/tools/appman/appman.cpp b/src/tools/appman/appman.cpp
index aba6e487..22f1daa2 100644
--- a/src/tools/appman/appman.cpp
+++ b/src/tools/appman/appman.cpp
@@ -128,6 +128,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 #if defined(AM_TESTRUNNER)
         a.qmlEngine()->rootContext()->setContextProperty("buildConfig", cfg.buildConfig());
 #endif
+        a.loadQml(cfg.loadDummyData());
+        a.showWindow(cfg.fullscreen() && !cfg.noFullscreen());
 
 #if defined(AM_TESTRUNNER)
         return TestRunner::exec(a.qmlEngine());