← Back to branch summary

~mir-team/qtmir/mir-0.16-rebuild

« back to all changes in this revision

Viewing changes to tests/modules/common/qtmir_test.h

  • Committer: CI Train Bot
  • Author(s): Daniel van Vugt, Andreas Pokorny
  • Date: 2015-08-04 17:21:02 UTC
  • mfrom: (266.1.24 devel-mir-next-fix-cmdline-params)
  • Revision ID: ci-train-bot@canonical.com-20150804172102-6n0ubhw06wmumy2u
ensure the argv passed to mir is a null terminated list (not a nullptr)
Approved by: Gerry Boland, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/common/qtmir_test.h
72
72
        {std::make_shared<StubPromptSessionManager>()};
73
73
};
74
74
 
 
75
 
 
76
namespace {  char const* argv[] = { nullptr }; }
 
77
 
75
78
class FakeMirServer: private TestMirServerInit, public MirServer
76
79
{
77
80
public:
78
81
    FakeMirServer()
79
 
    : MirServer(0, nullptr)
 
82
    : MirServer(0, argv)
80
83
    {
81
84
    }
82
85