Merge lp:~alan-griffiths/miral/fix-1621917 into lp:miral

Proposed by Alan Griffiths on 2016-09-12
Status: Merged
Approved by: Gerry Boland on 2016-09-13
Approved revision: 323
Merged at revision: 329
Proposed branch: lp:~alan-griffiths/miral/fix-1621917
Merge into: lp:miral
Prerequisite: lp:~alan-griffiths/miral/track-lp-mir
Diff against target: 36 lines (+12/-1)
1 file modified
test/test_server.cpp (+12/-1)
To merge this branch: bzr merge lp:~alan-griffiths/miral/fix-1621917
Reviewer Review Type Date Requested Status
Gerry Boland (community) 2016-09-12 Approve on 2016-09-13
Review via email: mp+305442@code.launchpad.net

Commit message

Fix test failures when built against Mir trunk

Description of the change

Fix test failures when built against Mir trunk

NB this needs lp:~alan-griffiths/mir/fix-1621917/+merge/305439

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

Dependent landed, acking this

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/test_server.cpp'
2--- test/test_server.cpp 2016-08-16 11:52:37 +0000
3+++ test/test_server.cpp 2016-09-12 08:32:47 +0000
4@@ -22,13 +22,17 @@
5 #include <miral/set_window_managment_policy.h>
6
7 #include <mir_test_framework/executable_path.h>
8-#include "mir_test_framework/stub_server_platform_factory.h"
9+#include <mir_test_framework/stub_server_platform_factory.h>
10
11 #include <mir/fd.h>
12 #include <mir/main_loop.h>
13 #include <mir/server.h>
14 #include <mir/version.h>
15
16+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
17+#include <mir_test_framework/headless_display_buffer_compositor_factory.h>
18+#endif
19+
20 #include <boost/throw_exception.hpp>
21
22
23@@ -72,6 +76,13 @@
24 started.notify_one();
25 });
26 });
27+
28+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
29+ server.override_the_display_buffer_compositor_factory([]
30+ {
31+ return std::make_shared<mtf::HeadlessDisplayBufferCompositorFactory>();
32+ });
33+#endif
34 };
35
36 try

Subscribers

People subscribed via source and target branches