Merge lp:~andreas-pokorny/qtmir/devel-mir-next-avoid-empty-cmdline-params into lp:qtmir/devel-mir-next

[Andreas Pokorny]

tests: pass an aribtrary application name to MirServer

Preparation for 0.15.

Since 0.14 mir evaluates the application name by accessing args[0]. To unblock the release 0.14 accepted invalid command line arguments. This is not the case on lp:mir or the upcoming 0.15 release.

[Alan Griffiths (alan-griffiths)]

Well, this likely works but argv is /supposed/ to be NULL terminated. Something like:

namespace { char const* const argv[] = { "qtmir-test", nullptr }; }

[Gerry Boland (gerboland)]

Why does mir care about the application name?

[Alan Griffiths (alan-griffiths)]

> Why does mir care about the application name?

It is used in generating the description text for the command line options. The code (src/platform/options/default_configuration.cpp) allows argv to be a single element "null terminated list" - so this would be fine:

namespace { char const* argv[] = { nullptr }; }
...
+ : MirServer(0, &args)

review: Needs Fixing

[lp:~andreas-pokorny/qtmir/devel-mir-next-avoid-empty-cmdline-params]

289. By Andreas Pokorny on 2015-07-31

make it null terminated

290. By Andreas Pokorny on 2015-07-31

remove the dummy application name

[Alan Griffiths (alan-griffiths)]

review: Approve

=== modified file 'tests/modules/common/qtmir_test.h'
--- tests/modules/common/qtmir_test.h	2015-03-24 23:38:33 +0000
+++ tests/modules/common/qtmir_test.h	2015-07-31 08:37:21 +0000
@@ -64,11 +64,14 @@
         {std::make_shared<StubPromptSessionManager>()};
 };
 
+
+namespace {  char const* argv[] = { nullptr }; }
+
 class FakeMirServer: private TestMirServerInit, public MirServer
 {
 public:
     FakeMirServer()
-    : MirServer(0, nullptr)
+    : MirServer(0, argv)
     {
     }