Merge lp:~afrantzis/mir/fix-clang-yakkety into lp:mir

[Alexandros Frantzis]

Fix clang build on yakkety

Fix clang build on yakkety

[Alexandros Frantzis (afrantzis)]

Need to run an exploratory yakkety clang CI job first.

review: Needs Information

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3640
https://mir-jenkins.ubuntu.com/job/mir-ci/1422/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1740
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1793
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1784
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1784
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1784
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1764
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1764/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1764
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1764/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1764
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1764/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1764
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1764/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1764
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1764/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1764
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1764/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1422/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

It seems clang/yakkety in CI produces builds errors I don't get locally. Investigating.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

It turns out that ccache (with clang) is what's causing build problems in CI. Will disable ccache for clang.

A successful run with clang/yakkety without ccache: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir-yakkety-clang/4/arch=amd64,compiler=clang,platform=mesa,release=yakkety/console

This MP is good to go for clang/yakkety.

review: Abstain

[Cemil Azizoglu (cemil-azizoglu)]

Looks good

review: Approve

[Alan Griffiths (alan-griffiths)]

+ using msh::ShellWrapper::raise;

That looks odd.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/474/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1748/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/507/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1801
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1792
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1792
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1792
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1772/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1772/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1772
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1772/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Unrelated CI failure is bug #1609411

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/475/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1749/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/508/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1802
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1793
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1793
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1793
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1773
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1773/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1773/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1773
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1773/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1773
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1773/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1773
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1773/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1773
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1773/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/477/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1752/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/510/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1805
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1796/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1796
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1796
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1776
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1776/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1776/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1776
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1776/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1776
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1776/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1776
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1776/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1776
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1776/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Cool. I remember seeing the warning about 'raise' but never bothered to look into it. Whatever works...

The CI failure above is just bug 1612012, and a Java/infrastructure failure. All unrelated.

review: Approve

[Daniel van Vugt (vanvugt)]

Incidentally, what options did you use to find these failures?

clang has been succeeding on yakkety for me for days already...

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/479/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1755/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/512/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1808
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1799/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1799/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1799/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1779
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1779
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1779
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1779
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1779
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1779/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1779
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1779/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Autolandings are failing for everyone right now...

03:43:31 FATAL: Remote call on cyclops-node14 failed
03:43:31 java.io.IOException: Remote call on cyclops-node14 failed

[Chris Halse Rogers (raof)]

Looks good to me. Let's see if CI is still on fire...

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-04 14:24:06 +0000
+++ CMakeLists.txt	2016-08-10 10:50:29 +0000
@@ -68,8 +68,6 @@
 
 option(MIR_USE_LD_GOLD "Enables the \"gold\" linker." OFF)
 if(MIR_USE_LD_GOLD)
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
   set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold")
   set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=gold")
   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")

=== modified file 'include/test/mir/test/doubles/stub_session.h'
--- include/test/mir/test/doubles/stub_session.h	2016-05-04 01:48:16 +0000
+++ include/test/mir/test/doubles/stub_session.h	2016-08-10 10:50:29 +0000
@@ -89,9 +89,9 @@
 
     void send_input_device_change(std::vector<std::shared_ptr<input::Device>> const& devices) override;
 
-    graphics::BufferID create_buffer(graphics::BufferProperties const& properties);
-    void destroy_buffer(graphics::BufferID);
-    std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID);
+    graphics::BufferID create_buffer(graphics::BufferProperties const& properties) override;
+    void destroy_buffer(graphics::BufferID) override;
+    std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID) override;
 
     pid_t pid;
 };

=== modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp'
--- tests/acceptance-tests/test_client_surface_visibility.cpp	2016-06-22 14:52:57 +0000
+++ tests/acceptance-tests/test_client_surface_visibility.cpp	2016-08-10 10:50:29 +0000
@@ -62,6 +62,8 @@
         return result;
     }
 
+    using msh::ShellWrapper::raise;
+
     std::shared_ptr<ms::Surface> surface(int index)
     {
         return surfaces[index].lock();

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2016-07-07 09:54:02 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2016-08-10 10:50:29 +0000
@@ -263,7 +263,7 @@
         wrapped->focus_next_session();
     }
 
-    auto focused_session() const -> std::shared_ptr<msc::Session>
+    auto focused_session() const -> std::shared_ptr<msc::Session> override
     {
         return wrapped->focused_session();
     }

=== modified file 'tests/acceptance-tests/throwback/test_client_library_errors.cpp'
--- tests/acceptance-tests/throwback/test_client_library_errors.cpp	2016-05-03 06:55:25 +0000
+++ tests/acceptance-tests/throwback/test_client_library_errors.cpp	2016-08-10 10:50:29 +0000
@@ -67,7 +67,7 @@
 template<Method failure_set>
 class ConfigurableFailurePlatform : public mir::client::ClientPlatform
 {
-    std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface *)
+    std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface *) override
     {
         if (should_fail<Method::create_egl_native_window, failure_set>())
         {
@@ -85,12 +85,12 @@
         return nullptr;
     }
 
-    MirPlatformType platform_type() const
+    MirPlatformType platform_type() const override
     {
         BOOST_THROW_EXCEPTION(std::runtime_error{exception_text});
         return MirPlatformType::mir_platform_type_gbm;
     }
-    std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory()
+    std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory() override
     {
         if (should_fail<Method::create_buffer_factory, failure_set>())
         {
@@ -98,11 +98,11 @@
         }
         return std::make_shared<mtd::StubClientBufferFactory>();
     }
-    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display()
+    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override
     {
         return std::shared_ptr<EGLNativeDisplayType>{};
     }
-    MirNativeBuffer *convert_native_buffer(mir::graphics::NativeBuffer*) const
+    MirNativeBuffer *convert_native_buffer(mir::graphics::NativeBuffer*) const override
     {
         BOOST_THROW_EXCEPTION(std::runtime_error{exception_text});
         return nullptr;

=== modified file 'tests/include/mir/test/doubles/mock_main_loop.h'
--- tests/include/mir/test/doubles/mock_main_loop.h	2016-05-03 06:55:25 +0000
+++ tests/include/mir/test/doubles/mock_main_loop.h	2016-08-10 10:50:29 +0000
@@ -63,14 +63,14 @@
     MOCK_METHOD1(create_alarm, std::unique_ptr<time::Alarm>(std::function<void()> const& callback));
     MOCK_METHOD1(create_alarm, std::unique_ptr<time::Alarm>(LockableCallback* callback));
 
-    std::unique_ptr<time::Alarm> create_alarm(std::unique_ptr<LockableCallback> callback)
+    std::unique_ptr<time::Alarm> create_alarm(std::unique_ptr<LockableCallback> callback) override
     {
         return create_alarm(callback.get());
     }
 
     void register_signal_handler(
         std::initializer_list<int> signals,
-        mir::UniqueModulePtr<std::function<void(int)>> handler)
+        mir::UniqueModulePtr<std::function<void(int)>> handler) override
     {
         register_signal_handler_module_ptr(signals, *handler);
     }
@@ -78,7 +78,7 @@
     void register_fd_handler(
          std::initializer_list<int> fds,
          void const* owner,
-         mir::UniqueModulePtr<std::function<void(int)>> handler)
+         mir::UniqueModulePtr<std::function<void(int)>> handler) override
     {
         register_fd_handler_module_ptr(fds, owner, *handler);
     }

=== modified file 'tests/include/mir/test/doubles/null_prompt_session_manager.h'
--- tests/include/mir/test/doubles/null_prompt_session_manager.h	2015-02-22 07:46:25 +0000
+++ tests/include/mir/test/doubles/null_prompt_session_manager.h	2016-08-10 10:50:29 +0000
@@ -32,12 +32,12 @@
 {
 public:
     std::shared_ptr<scene::PromptSession> start_prompt_session_for(std::shared_ptr<scene::Session> const&,
-                                                                   scene::PromptSessionCreationParameters const&) const
+                                                                   scene::PromptSessionCreationParameters const&) const override
     {
         return std::shared_ptr<scene::PromptSession>();
     }
 
-    void stop_prompt_session(std::shared_ptr<scene::PromptSession> const&) const
+    void stop_prompt_session(std::shared_ptr<scene::PromptSession> const&) const override
     {
     }
 
@@ -50,26 +50,26 @@
     }
 
     void add_prompt_provider(std::shared_ptr<scene::PromptSession> const&,
-                             std::shared_ptr<scene::Session> const&) const
-    {
-    }
-
-    void remove_session(std::shared_ptr<scene::Session> const&) const
-    {
-    }
-
-    std::shared_ptr<scene::Session> application_for(std::shared_ptr<scene::PromptSession> const&) const
+                             std::shared_ptr<scene::Session> const&) const override
+    {
+    }
+
+    void remove_session(std::shared_ptr<scene::Session> const&) const override
+    {
+    }
+
+    std::shared_ptr<scene::Session> application_for(std::shared_ptr<scene::PromptSession> const&) const override
     {
         return std::shared_ptr<scene::Session>();
     }
 
-    std::shared_ptr<scene::Session> helper_for(std::shared_ptr<scene::PromptSession> const&) const
+    std::shared_ptr<scene::Session> helper_for(std::shared_ptr<scene::PromptSession> const&) const override
     {
         return std::shared_ptr<scene::Session>();
     }
 
     void for_each_provider_in(std::shared_ptr<scene::PromptSession> const&,
-                              std::function<void(std::shared_ptr<scene::Session> const&)> const&) const
+                              std::function<void(std::shared_ptr<scene::Session> const&)> const&) const override
     {
     }
 };

=== modified file 'tests/include/mir/test/doubles/stub_buffer_stream.h'
--- tests/include/mir/test/doubles/stub_buffer_stream.h	2016-05-04 01:48:16 +0000
+++ tests/include/mir/test/doubles/stub_buffer_stream.h	2016-08-10 10:50:29 +0000
@@ -70,18 +70,18 @@
         if (b) ++nready;
         complete(&stub_client_buffer);
     }
-    void with_most_recent_buffer_do(std::function<void(graphics::Buffer&)> const& fn)
+    void with_most_recent_buffer_do(std::function<void(graphics::Buffer&)> const& fn) override
     {
         thread_name = current_thread_name();
         fn(*stub_compositor_buffer);
     }
-    MirPixelFormat pixel_format() const { return mir_pixel_format_abgr_8888; }
-    void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) {}
-    void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) {}
-    bool has_submitted_buffer() const { return true; }
-    void associate_buffer(graphics::BufferID) {}
-    void disassociate_buffer(graphics::BufferID) {}
-    void set_scale(float) {}
+    MirPixelFormat pixel_format() const override { return mir_pixel_format_abgr_8888; }
+    void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override {}
+    void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override {}
+    bool has_submitted_buffer() const override { return true; }
+    void associate_buffer(graphics::BufferID) override {}
+    void disassociate_buffer(graphics::BufferID) override {}
+    void set_scale(float) override {}
 
     StubBuffer stub_client_buffer;
     std::shared_ptr<graphics::Buffer> stub_compositor_buffer;

=== modified file 'tests/include/mir/test/doubles/stub_client_buffer.h'
--- tests/include/mir/test/doubles/stub_client_buffer.h	2016-08-01 07:24:32 +0000
+++ tests/include/mir/test/doubles/stub_client_buffer.h	2016-08-10 10:50:29 +0000
@@ -74,10 +74,10 @@
     void update_from(MirBufferPackage const&) override {}
     void fill_update_msg(MirBufferPackage&)  override{}
 
-    MirNativeBuffer* as_mir_native_buffer() const { return nullptr; }
-    void set_fence(MirNativeFence, MirBufferAccess) {}
-    MirNativeFence get_fence() const { return nullptr; }
-    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) { return true; }
+    MirNativeBuffer* as_mir_native_buffer() const override { return nullptr; }
+    void set_fence(MirNativeFence, MirBufferAccess) override {}
+    MirNativeFence get_fence() const override { return nullptr; }
+    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override { return true; }
 
     std::shared_ptr<MirBufferPackage> const package;
     geometry::Size size_;

=== modified file 'tests/include/mir/test/doubles/stub_host_connection.h'
--- tests/include/mir/test/doubles/stub_host_connection.h	2016-06-09 13:15:34 +0000
+++ tests/include/mir/test/doubles/stub_host_connection.h	2016-08-10 10:50:29 +0000
@@ -73,16 +73,16 @@
         return {{},{}};
     }
 
-    void set_cursor_image(graphics::CursorImage const&)
-    {
-    }
-    void hide_cursor()
-    {
-    }
-
-    auto graphics_platform_library() -> std::string { return {}; }
-
-    graphics::nested::UniqueInputConfig create_input_device_config()
+    void set_cursor_image(graphics::CursorImage const&) override
+    {
+    }
+    void hide_cursor() override
+    {
+    }
+
+    auto graphics_platform_library() -> std::string override { return {}; }
+
+    graphics::nested::UniqueInputConfig create_input_device_config() override
     {
         return graphics::nested::UniqueInputConfig(reinterpret_cast<MirInputConfig*>(new std::vector<input::DeviceData>),
                                                    mir_input_config_destroy);

=== modified file 'tests/include/mir/test/doubles/stub_input_scene.h'
--- tests/include/mir/test/doubles/stub_input_scene.h	2015-02-22 07:46:25 +0000
+++ tests/include/mir/test/doubles/stub_input_scene.h	2016-08-10 10:50:29 +0000
@@ -33,21 +33,21 @@
     void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& ) override
     {
     }
-    void add_observer(std::shared_ptr<scene::Observer> const& /* observer */)
+    void add_observer(std::shared_ptr<scene::Observer> const& /* observer */) override
     {
     }
-    void remove_observer(std::weak_ptr<scene::Observer> const& /* observer */)
+    void remove_observer(std::weak_ptr<scene::Observer> const& /* observer */) override
     {
     }
 
-    void add_input_visualization(std::shared_ptr<graphics::Renderable> const& /* overlay */)
+    void add_input_visualization(std::shared_ptr<graphics::Renderable> const& /* overlay */) override
     {
     }
-    void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& /* overlay */)
+    void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& /* overlay */) override
     {
     }
     
-    void emit_scene_changed()
+    void emit_scene_changed() override
     {
     }
 };

=== modified file 'tests/include/mir/test/doubles/stub_scene_element.h'
--- tests/include/mir/test/doubles/stub_scene_element.h	2015-06-17 05:20:42 +0000
+++ tests/include/mir/test/doubles/stub_scene_element.h	2016-08-10 10:50:29 +0000
@@ -43,7 +43,7 @@
     {
     }
 
-    std::shared_ptr<graphics::Renderable> renderable() const
+    std::shared_ptr<graphics::Renderable> renderable() const override
     {
         return renderable_;
     }

=== modified file 'tests/include/mir/test/doubles/stub_scene_surface.h'
--- tests/include/mir/test/doubles/stub_scene_surface.h	2016-06-27 20:44:49 +0000
+++ tests/include/mir/test/doubles/stub_scene_surface.h	2016-08-10 10:50:29 +0000
@@ -78,7 +78,7 @@
     void resize(geometry::Size const&) override {}
     void set_transformation(glm::mat4 const&) override {}
     void set_alpha(float) override {}
-    void set_orientation(MirOrientation) {}
+    void set_orientation(MirOrientation) override {}
 
     void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override {}
     void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override {}
@@ -86,8 +86,8 @@
     void set_reception_mode(input::InputReceptionMode mode) override { input_mode = mode; }
     void consume(MirEvent const*) override {}
 
-    void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) {}
-    std::shared_ptr<graphics::CursorImage> cursor_image() const { return {}; }
+    void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) override {}
+    std::shared_ptr<graphics::CursorImage> cursor_image() const override { return {}; }
 
     void request_client_surface_close() override {}
 
@@ -102,8 +102,8 @@
     void set_keymap(MirInputDeviceId, std::string const&, std::string const&, std::string const&, std::string const&) override
     {}
 
-    void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) {}
-    void rename(std::string const&) {}
+    void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) override {}
+    void rename(std::string const&) override {}
     std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override { return nullptr; }
 
     void set_confine_pointer_state(MirPointerConfinementState /*state*/) override {}

=== modified file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
--- tests/include/mir_test_framework/stub_client_platform_factory.h	2016-05-03 06:55:25 +0000
+++ tests/include/mir_test_framework/stub_client_platform_factory.h	2016-08-10 10:50:29 +0000
@@ -28,13 +28,13 @@
 struct StubClientPlatform : public mir::client::ClientPlatform
 {
     StubClientPlatform(mir::client::ClientContext* context);
-    MirPlatformType platform_type() const;
-    void populate(MirPlatformPackage& package) const;
+    MirPlatformType platform_type() const override;
+    void populate(MirPlatformPackage& package) const override;
     MirPlatformMessage* platform_operation(MirPlatformMessage const*) override;
-    std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory();
-    std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface* surface);
-    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display();
-    MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const;
+    std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory() override;
+    std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface* surface) override;
+    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
+    MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
     mir::client::ClientContext* const context;
 };

=== modified file 'tests/integration-tests/test_buffer_scheduling.cpp'
--- tests/integration-tests/test_buffer_scheduling.cpp	2016-06-24 17:52:00 +0000
+++ tests/integration-tests/test_buffer_scheduling.cpp	2016-08-10 10:50:29 +0000
@@ -112,13 +112,13 @@
             std::bind(&BufferQueueProducer::buffer_ready, this, std::placeholders::_1));
     }
 
-    bool can_produce()
+    bool can_produce() override
     {
         std::unique_lock<decltype(mutex)> lk(mutex);
         return buffer;
     }
 
-    mg::BufferID current_id()
+    mg::BufferID current_id() override
     {
         if (buffer)
             return buffer->id();
@@ -126,7 +126,7 @@
             return mg::BufferID{INT_MAX};
     }
 
-    void produce()
+    void produce() override
     {
         mg::Buffer* b = nullptr;
         if (can_produce())
@@ -148,20 +148,20 @@
         }
     }
 
-    std::vector<BufferEntry> production_log()
+    std::vector<BufferEntry> production_log() override
     {
         std::unique_lock<decltype(mutex)> lk(mutex);
         return entries;
     }
 
-    geom::Size last_size()
+    geom::Size last_size() override
     {
         if (buffer)
             return buffer->size();
         return geom::Size{};
     }
 
-    void reset_log()
+    void reset_log() override
     {
         std::unique_lock<decltype(mutex)> lk(mutex);
         return entries.clear();
@@ -196,12 +196,12 @@
         return b;
     }
 
-    std::vector<BufferEntry> consumption_log()
+    std::vector<BufferEntry> consumption_log() override
     {
         return entries;
     }
 
-    geom::Size last_size()
+    geom::Size last_size() override
     {
         return last_size_;
     }

=== modified file 'tests/integration-tests/test_display_server_main_loop_events.cpp'
--- tests/integration-tests/test_display_server_main_loop_events.cpp	2016-05-03 06:55:25 +0000
+++ tests/integration-tests/test_display_server_main_loop_events.cpp	2016-08-10 10:50:29 +0000
@@ -91,7 +91,7 @@
         display->for_each_display_sync_group(f);
     }
 
-    std::unique_ptr<mg::DisplayConfiguration> configuration() const
+    std::unique_ptr<mg::DisplayConfiguration> configuration() const override
     {
         return std::unique_ptr<mg::DisplayConfiguration>(
             new mtd::NullDisplayConfiguration

=== modified file 'tests/integration-tests/test_exchange_buffer.cpp'
--- tests/integration-tests/test_exchange_buffer.cpp	2016-05-04 01:48:16 +0000
+++ tests/integration-tests/test_exchange_buffer.cpp	2016-08-10 10:50:29 +0000
@@ -70,7 +70,7 @@
     {
     }
 
-    void client_acquire(std::function<void(mg::Buffer* buffer)> complete)
+    void client_acquire(std::function<void(mg::Buffer* buffer)> complete) override
     {
         std::shared_ptr<mg::Buffer> stub_buffer;
         if (buffers_acquired < buffer_id_seq.size())
@@ -81,22 +81,22 @@
         client_buffers.push_back(stub_buffer);
         complete(stub_buffer.get());
     }
-    void client_release(mg::Buffer*) {}
-    std::shared_ptr<mg::Buffer> compositor_acquire(void const*)
-        { return std::make_shared<mtd::StubBuffer>(); }
-    void compositor_release(std::shared_ptr<mg::Buffer> const&) {}
-    std::shared_ptr<mg::Buffer> snapshot_acquire()
-        { return std::make_shared<mtd::StubBuffer>(); }
-    void snapshot_release(std::shared_ptr<mg::Buffer> const&) {}
-    mg::BufferProperties properties() const { return mg::BufferProperties{}; }
-    void allow_framedropping(bool) {}
+    void client_release(mg::Buffer*) override {}
+    std::shared_ptr<mg::Buffer> compositor_acquire(void const*) override
+        { return std::make_shared<mtd::StubBuffer>(); }
+    void compositor_release(std::shared_ptr<mg::Buffer> const&) override {}
+    std::shared_ptr<mg::Buffer> snapshot_acquire() override
+        { return std::make_shared<mtd::StubBuffer>(); }
+    void snapshot_release(std::shared_ptr<mg::Buffer> const&) override {}
+    mg::BufferProperties properties() const override { return mg::BufferProperties{}; }
+    void allow_framedropping(bool) override {}
     void set_mode(mc::MultiMonitorMode) override {}
-    void force_requests_to_complete() {}
-    void resize(const geom::Size&) {}
-    int buffers_ready_for_compositor(void const*) const { return 1; }
-    int buffers_free_for_client() const { return 1; }
-    void drop_old_buffers() {}
-    void drop_client_requests() {}
+    void force_requests_to_complete() override {}
+    void resize(const geom::Size&) override {}
+    int buffers_ready_for_compositor(void const*) const override { return 1; }
+    int buffers_free_for_client() const override { return 1; }
+    void drop_old_buffers() override {}
+    void drop_client_requests() override {}
 
     std::vector<std::shared_ptr<mg::Buffer>> client_buffers;
     std::vector<mg::BufferID> const buffer_id_seq;
@@ -116,7 +116,7 @@
     std::shared_ptr<mc::BufferStream> create_buffer_stream(
         mf::BufferStreamId, std::shared_ptr<mf::ClientBuffers> const&, mg::BufferProperties const&) override
     { return std::make_shared<mc::BufferStreamSurfaces>(std::make_shared<StubBundle>(buffer_id_seq)); }
-    std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&)
+    std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&) override
     { return nullptr; }
     std::vector<mg::BufferID> const buffer_id_seq;
 };

=== modified file 'tests/integration-tests/test_protobuf.cpp'
--- tests/integration-tests/test_protobuf.cpp	2016-03-30 01:12:38 +0000
+++ tests/integration-tests/test_protobuf.cpp	2016-08-10 10:50:29 +0000
@@ -97,7 +97,7 @@
 
     void client_pid(int /*pid*/) override {}
 
-    bool dispatch(mfd::Invocation const& invocation, std::vector<mir::Fd> const& fds)
+    bool dispatch(mfd::Invocation const& invocation, std::vector<mir::Fd> const& fds) override
     {
         if ("function" == invocation.method_name())
         {
@@ -181,7 +181,7 @@
 
     std::shared_ptr<DemoConnectionCreator> demo_connection_creator;
 
-    void SetUp()
+    void SetUp() override
     {
         ::demo_mir_server = &demo_mir_server;
 

=== modified file 'tests/integration-tests/test_swapinterval.cpp'
--- tests/integration-tests/test_swapinterval.cpp	2016-05-04 01:48:16 +0000
+++ tests/integration-tests/test_swapinterval.cpp	2016-08-10 10:50:29 +0000
@@ -79,7 +79,7 @@
         return std::make_shared<StubBufferStream>(framedropping_enabled);
     }
 
-    std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&)
+    std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&) override
     {
         return nullptr;
     }

=== modified file 'tests/integration-tests/test_touchspot_visualization.cpp'
--- tests/integration-tests/test_touchspot_visualization.cpp	2016-01-29 08:18:22 +0000
+++ tests/integration-tests/test_touchspot_visualization.cpp	2016-08-10 10:50:29 +0000
@@ -135,7 +135,7 @@
         server_configuration.exec();
     }
 
-    void TearDown()
+    void TearDown() override
     {
         test_complete_fence.ready();
         server_configuration.on_exit();

=== modified file 'tests/unit-tests/client/test_aging_buffer.cpp'
--- tests/unit-tests/client/test_aging_buffer.cpp	2016-08-01 07:24:32 +0000
+++ tests/unit-tests/client/test_aging_buffer.cpp	2016-08-10 10:50:29 +0000
@@ -64,22 +64,22 @@
     {
     }
 
-    MirNativeBuffer* as_mir_native_buffer() const
-    {
-        exit(1);
-    }
-
-    void set_fence(MirNativeFence, MirBufferAccess)
-    {
-        exit(1);
-    }
-
-    MirNativeFence get_fence() const
-    {
-        exit(1);
-    }
-
-    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds)
+    MirNativeBuffer* as_mir_native_buffer() const override
+    {
+        exit(1);
+    }
+
+    void set_fence(MirNativeFence, MirBufferAccess) override
+    {
+        exit(1);
+    }
+
+    MirNativeFence get_fence() const override
+    {
+        exit(1);
+    }
+
+    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override
     {
         exit(1);
     }

=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
--- tests/unit-tests/client/test_client_buffer_stream.cpp	2016-06-02 11:19:25 +0000
+++ tests/unit-tests/client/test_client_buffer_stream.cpp	2016-08-10 10:50:29 +0000
@@ -88,7 +88,7 @@
     {
         return buffer_factory;
     }
-    MirPlatformMessage* platform_operation(MirPlatformMessage const* /* request */)
+    MirPlatformMessage* platform_operation(MirPlatformMessage const* /* request */) override
     {
         return nullptr;
     }

=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2016-06-08 12:30:14 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2016-08-10 10:50:29 +0000
@@ -108,7 +108,7 @@
     void release_surface(
         const mir::protobuf::SurfaceId*,
         mir::protobuf::Void*,
-        google::protobuf::Closure* done)
+        google::protobuf::Closure* done) override
     {
         done->Run();
     }
@@ -125,7 +125,7 @@
     void modify_surface(
         const mir::protobuf::SurfaceModifications*, 
         mir::protobuf::Void*,
-        google::protobuf::Closure* done)
+        google::protobuf::Closure* done) override
     {
         done->Run();
     }

=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2016-06-24 17:52:00 +0000
+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2016-08-10 10:50:29 +0000
@@ -88,14 +88,14 @@
     void insert(mir::frontend::BufferStreamId, std::shared_ptr<MirPresentationChain> const&)
     {
     }
-    std::shared_ptr<mcl::MirBuffer> buffer(int) const
+    std::shared_ptr<mcl::MirBuffer> buffer(int) const override
     {
         return nullptr;
     }
-    void insert(int, std::shared_ptr<mcl::MirBuffer> const&)
+    void insert(int, std::shared_ptr<mcl::MirBuffer> const&) override
     {
     }
-    void erase(int)
+    void erase(int) override
     {
     }
 };

=== modified file 'tests/unit-tests/compositor/test_multi_threaded_compositor.cpp'
--- tests/unit-tests/compositor/test_multi_threaded_compositor.cpp	2016-05-03 06:55:25 +0000
+++ tests/unit-tests/compositor/test_multi_threaded_compositor.cpp	2016-08-10 10:50:29 +0000
@@ -101,7 +101,7 @@
     {
     }
 
-    void add_observer(std::shared_ptr<ms::Observer> const& observer_)
+    void add_observer(std::shared_ptr<ms::Observer> const& observer_) override
     {
         std::lock_guard<std::mutex> lock{observer_mutex};
 
@@ -112,7 +112,7 @@
         observer = observer_;
     }
 
-    void remove_observer(std::weak_ptr<ms::Observer> const& /* observer */)
+    void remove_observer(std::weak_ptr<ms::Observer> const& /* observer */) override
     {
         std::lock_guard<std::mutex> lock{observer_mutex};
         observer.reset();

=== modified file 'tests/unit-tests/frontend/test_protobuf_message_processor.cpp'
--- tests/unit-tests/frontend/test_protobuf_message_processor.cpp	2016-01-29 08:18:22 +0000
+++ tests/unit-tests/frontend/test_protobuf_message_processor.cpp	2016-08-10 10:50:29 +0000
@@ -76,7 +76,7 @@
     void create_surface(
         mp::SurfaceParameters const*,
         mp::Surface* response,
-        google::protobuf::Closure* closure)
+        google::protobuf::Closure* closure) override
     {
         response->mutable_buffer_stream();
         auto before = response->buffer_stream().has_buffer();
@@ -88,7 +88,7 @@
     void create_buffer_stream(
         mp::BufferStreamParameters const*,
         mp::BufferStream* response,
-        google::protobuf::Closure* closure)
+        google::protobuf::Closure* closure) override
     {
         auto before = response->has_buffer();
         closure->Run();

=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2016-08-01 09:03:52 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2016-08-10 10:50:29 +0000
@@ -119,7 +119,7 @@
         ON_CALL(*this, destroy_buffer(_))
             .WillByDefault(Invoke([this](mg::BufferID){ ++destroy_buffers;}));
     }
-    std::shared_ptr<mf::Surface> get_surface(mf::SurfaceId surface) const
+    std::shared_ptr<mf::Surface> get_surface(mf::SurfaceId surface) const override
     {
         if (mock_surfaces.find(surface) == mock_surfaces.end())
             BOOST_THROW_EXCEPTION(std::logic_error("Invalid SurfaceId"));
@@ -176,7 +176,7 @@
 
     mf::SurfaceId create_surface(
         ms::SurfaceCreationParameters const&,
-        std::shared_ptr<mf::EventSink> const&)
+        std::shared_ptr<mf::EventSink> const&) override
     {
         mf::SurfaceId id{last_surface_id};
         if (mock_surfaces.end() == mock_surfaces.find(id))
@@ -185,7 +185,7 @@
         return id;
     }
 
-    mf::BufferStreamId create_buffer_stream(mg::BufferProperties const&)
+    mf::BufferStreamId create_buffer_stream(mg::BufferProperties const&) override
     {
         mf::BufferStreamId id{last_stream_id};
         if (mock_streams.end() == mock_streams.find(id))
@@ -194,13 +194,13 @@
         return id;
     }
 
-    void destroy_surface(mf::SurfaceId surface)
+    void destroy_surface(mf::SurfaceId surface) override
     {
         mock_surfaces.erase(surface);
     }
 
     
-    mg::BufferID create_buffer(mg::BufferProperties const&)
+    mg::BufferID create_buffer(mg::BufferProperties const&) override
     {
         buffer_count++;
         return mg::BufferID{3};

=== modified file 'tests/unit-tests/graphics/test_overlapping_output_grouping.cpp'
--- tests/unit-tests/graphics/test_overlapping_output_grouping.cpp	2016-01-29 08:18:22 +0000
+++ tests/unit-tests/graphics/test_overlapping_output_grouping.cpp	2016-08-10 10:50:29 +0000
@@ -60,7 +60,7 @@
     {
     }
 
-    void for_each_card(std::function<void(mg::DisplayConfigurationCard const&)> f) const
+    void for_each_card(std::function<void(mg::DisplayConfigurationCard const&)> f) const override
     {
         mg::DisplayConfigurationCard card
         {
@@ -71,7 +71,7 @@
         f(card);
     }
 
-    void for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)> f) const
+    void for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)> f) const override
     {
         uint32_t i = 1;
         for (auto const& info : outputs)

=== modified file 'tests/unit-tests/scene/test_application_session.cpp'
--- tests/unit-tests/scene/test_application_session.cpp	2016-06-02 05:33:50 +0000
+++ tests/unit-tests/scene/test_application_session.cpp	2016-08-10 10:50:29 +0000
@@ -130,7 +130,7 @@
     void remove_surface(std::weak_ptr<ms::Surface> const&) override
     {
     }
-    auto surface_at(mir::geometry::Point) const -> std::shared_ptr<ms::Surface>
+    auto surface_at(mir::geometry::Point) const -> std::shared_ptr<ms::Surface> override
     {
         return std::shared_ptr<ms::Surface>{};
     }