← Back to branch summary

~ci-train-bot/miral/miral-ubuntu-zesty-2317

« back to all changes in this revision

Viewing changes to test/test_server.cpp

  • Committer: Alan Griffiths
  • Date: 2016-09-13 12:54:44 UTC
  • mfrom: (320.4.2 miral)
  • Revision ID: alan@octopull.co.uk-20160913125444-kw6q96ijlod010ww
Fix test failures when built against Mir trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/test_server.cpp
22
22
#include <miral/set_window_managment_policy.h>
23
23
 
24
24
#include <mir_test_framework/executable_path.h>
25
 
#include "mir_test_framework/stub_server_platform_factory.h"
 
25
#include <mir_test_framework/stub_server_platform_factory.h>
26
26
 
27
27
#include <mir/fd.h>
28
28
#include <mir/main_loop.h>
29
29
#include <mir/server.h>
30
30
#include <mir/version.h>
31
31
 
 
32
#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
 
33
#include <mir_test_framework/headless_display_buffer_compositor_factory.h>
 
34
#endif
 
35
 
32
36
#include <boost/throw_exception.hpp>
33
37
 
34
38
 
72
76
                                     started.notify_one();
73
77
                                });
74
78
                        });
 
79
 
 
80
#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
 
81
                    server.override_the_display_buffer_compositor_factory([]
 
82
                        {
 
83
                            return std::make_shared<mtf::HeadlessDisplayBufferCompositorFactory>();
 
84
                        });
 
85
#endif
75
86
                };
76
87
 
77
88
            try