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

[Alan Griffiths]

Fix test failures when built against Mir trunk

Fix test failures when built against Mir trunk

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

[Gerry Boland (gerboland)]

Dependent landed, acking this

review: Approve

=== modified file 'test/test_server.cpp'
--- test/test_server.cpp	2016-08-16 11:52:37 +0000
+++ test/test_server.cpp	2016-09-12 08:32:47 +0000
@@ -22,13 +22,17 @@
 #include <miral/set_window_managment_policy.h>
 
 #include <mir_test_framework/executable_path.h>
-#include "mir_test_framework/stub_server_platform_factory.h"
+#include <mir_test_framework/stub_server_platform_factory.h>
 
 #include <mir/fd.h>
 #include <mir/main_loop.h>
 #include <mir/server.h>
 #include <mir/version.h>
 
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+#include <mir_test_framework/headless_display_buffer_compositor_factory.h>
+#endif
+
 #include <boost/throw_exception.hpp>
 
 
@@ -72,6 +76,13 @@
                                      started.notify_one();
                                 });
                         });
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+                    server.override_the_display_buffer_compositor_factory([]
+                        {
+                            return std::make_shared<mtf::HeadlessDisplayBufferCompositorFactory>();
+                        });
+#endif
                 };
 
             try