summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel van Vugt <daniel.van.vugt@canonical.com>2015-08-04 17:21:02 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-08-04 17:21:02 +0000
commit3987879b4c5e141333d51d6329aaafdf7da248ab (patch)
tree07f41c7085eeaddf8df5b1a6252e54a28a266685
parent8f8a20be50f1806fd04dc5b236f4c59af5a2ef2f (diff)
parentae9bdbeac8f762d9eed4fff86e478d729337090a (diff)
ensure the argv passed to mir is a null terminated list (not a nullptr)
Approved by: Gerry Boland, PS Jenkins bot
-rw-r--r--tests/modules/common/qtmir_test.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/modules/common/qtmir_test.h b/tests/modules/common/qtmir_test.h
index c357d11..7832a73 100644
--- a/tests/modules/common/qtmir_test.h
+++ b/tests/modules/common/qtmir_test.h
@@ -72,11 +72,14 @@ private:
{std::make_shared<StubPromptSessionManager>()};
};
+
+namespace { char const* argv[] = { nullptr }; }
+
class FakeMirServer: private TestMirServerInit, public MirServer
{
public:
FakeMirServer()
- : MirServer(0, nullptr)
+ : MirServer(0, argv)
{
}