Mir

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

Proposed by Alexandros Frantzis on 2016-08-10
Status: Merged
Approved by: Chris Halse Rogers on 2016-08-11
Approved revision: 3640
Merged at revision: 3641
Proposed branch: lp:~afrantzis/mir/fix-clang-yakkety
Merge into: lp:mir
Diff against target: 783 lines (+130/-130)
29 files modified
CMakeLists.txt (+0/-2)
include/test/mir/test/doubles/stub_session.h (+3/-3)
tests/acceptance-tests/test_client_surface_visibility.cpp (+2/-0)
tests/acceptance-tests/test_nested_mir.cpp (+1/-1)
tests/acceptance-tests/throwback/test_client_library_errors.cpp (+5/-5)
tests/include/mir/test/doubles/mock_main_loop.h (+3/-3)
tests/include/mir/test/doubles/null_prompt_session_manager.h (+13/-13)
tests/include/mir/test/doubles/stub_buffer_stream.h (+8/-8)
tests/include/mir/test/doubles/stub_client_buffer.h (+4/-4)
tests/include/mir/test/doubles/stub_host_connection.h (+10/-10)
tests/include/mir/test/doubles/stub_input_scene.h (+5/-5)
tests/include/mir/test/doubles/stub_scene_element.h (+1/-1)
tests/include/mir/test/doubles/stub_scene_surface.h (+5/-5)
tests/include/mir_test_framework/stub_client_platform_factory.h (+6/-6)
tests/integration-tests/test_buffer_scheduling.cpp (+8/-8)
tests/integration-tests/test_display_server_main_loop_events.cpp (+1/-1)
tests/integration-tests/test_exchange_buffer.cpp (+17/-17)
tests/integration-tests/test_protobuf.cpp (+2/-2)
tests/integration-tests/test_swapinterval.cpp (+1/-1)
tests/integration-tests/test_touchspot_visualization.cpp (+1/-1)
tests/unit-tests/client/test_aging_buffer.cpp (+16/-16)
tests/unit-tests/client/test_client_buffer_stream.cpp (+1/-1)
tests/unit-tests/client/test_client_mir_surface.cpp (+2/-2)
tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+3/-3)
tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+2/-2)
tests/unit-tests/frontend/test_protobuf_message_processor.cpp (+2/-2)
tests/unit-tests/frontend/test_session_mediator.cpp (+5/-5)
tests/unit-tests/graphics/test_overlapping_output_grouping.cpp (+2/-2)
tests/unit-tests/scene/test_application_session.cpp (+1/-1)
To merge this branch: bzr merge lp:~afrantzis/mir/fix-clang-yakkety
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2016-08-11
Chris Halse Rogers Approve on 2016-08-11
Daniel van Vugt Approve on 2016-08-11
Alan Griffiths Approve on 2016-08-10
Cemil Azizoglu (community) Approve on 2016-08-10
Alexandros Frantzis (community) Abstain on 2016-08-10
Review via email: mp+302529@code.launchpad.net

Commit message

Fix clang build on yakkety

Description of the change

Fix clang build on yakkety

To post a comment you must log in.
Alexandros Frantzis (afrantzis) wrote :

Need to run an exploratory yakkety clang CI job first.

review: Needs Information
Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

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

review: Needs Fixing
Alexandros Frantzis (afrantzis) wrote :

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) wrote :

Looks good

review: Approve
Alan Griffiths (alan-griffiths) wrote :

+ using msh::ShellWrapper::raise;

That looks odd.

review: Approve
Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

Unrelated CI failure is bug #1609411

Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-08-04 14:24:06 +0000
3+++ CMakeLists.txt 2016-08-10 10:50:29 +0000
4@@ -68,8 +68,6 @@
5
6 option(MIR_USE_LD_GOLD "Enables the \"gold\" linker." OFF)
7 if(MIR_USE_LD_GOLD)
8- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
9- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
10 set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold")
11 set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=gold")
12 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
13
14=== modified file 'include/test/mir/test/doubles/stub_session.h'
15--- include/test/mir/test/doubles/stub_session.h 2016-05-04 01:48:16 +0000
16+++ include/test/mir/test/doubles/stub_session.h 2016-08-10 10:50:29 +0000
17@@ -89,9 +89,9 @@
18
19 void send_input_device_change(std::vector<std::shared_ptr<input::Device>> const& devices) override;
20
21- graphics::BufferID create_buffer(graphics::BufferProperties const& properties);
22- void destroy_buffer(graphics::BufferID);
23- std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID);
24+ graphics::BufferID create_buffer(graphics::BufferProperties const& properties) override;
25+ void destroy_buffer(graphics::BufferID) override;
26+ std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID) override;
27
28 pid_t pid;
29 };
30
31=== modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp'
32--- tests/acceptance-tests/test_client_surface_visibility.cpp 2016-06-22 14:52:57 +0000
33+++ tests/acceptance-tests/test_client_surface_visibility.cpp 2016-08-10 10:50:29 +0000
34@@ -62,6 +62,8 @@
35 return result;
36 }
37
38+ using msh::ShellWrapper::raise;
39+
40 std::shared_ptr<ms::Surface> surface(int index)
41 {
42 return surfaces[index].lock();
43
44=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
45--- tests/acceptance-tests/test_nested_mir.cpp 2016-07-07 09:54:02 +0000
46+++ tests/acceptance-tests/test_nested_mir.cpp 2016-08-10 10:50:29 +0000
47@@ -263,7 +263,7 @@
48 wrapped->focus_next_session();
49 }
50
51- auto focused_session() const -> std::shared_ptr<msc::Session>
52+ auto focused_session() const -> std::shared_ptr<msc::Session> override
53 {
54 return wrapped->focused_session();
55 }
56
57=== modified file 'tests/acceptance-tests/throwback/test_client_library_errors.cpp'
58--- tests/acceptance-tests/throwback/test_client_library_errors.cpp 2016-05-03 06:55:25 +0000
59+++ tests/acceptance-tests/throwback/test_client_library_errors.cpp 2016-08-10 10:50:29 +0000
60@@ -67,7 +67,7 @@
61 template<Method failure_set>
62 class ConfigurableFailurePlatform : public mir::client::ClientPlatform
63 {
64- std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface *)
65+ std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface *) override
66 {
67 if (should_fail<Method::create_egl_native_window, failure_set>())
68 {
69@@ -85,12 +85,12 @@
70 return nullptr;
71 }
72
73- MirPlatformType platform_type() const
74+ MirPlatformType platform_type() const override
75 {
76 BOOST_THROW_EXCEPTION(std::runtime_error{exception_text});
77 return MirPlatformType::mir_platform_type_gbm;
78 }
79- std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory()
80+ std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory() override
81 {
82 if (should_fail<Method::create_buffer_factory, failure_set>())
83 {
84@@ -98,11 +98,11 @@
85 }
86 return std::make_shared<mtd::StubClientBufferFactory>();
87 }
88- std::shared_ptr<EGLNativeDisplayType> create_egl_native_display()
89+ std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override
90 {
91 return std::shared_ptr<EGLNativeDisplayType>{};
92 }
93- MirNativeBuffer *convert_native_buffer(mir::graphics::NativeBuffer*) const
94+ MirNativeBuffer *convert_native_buffer(mir::graphics::NativeBuffer*) const override
95 {
96 BOOST_THROW_EXCEPTION(std::runtime_error{exception_text});
97 return nullptr;
98
99=== modified file 'tests/include/mir/test/doubles/mock_main_loop.h'
100--- tests/include/mir/test/doubles/mock_main_loop.h 2016-05-03 06:55:25 +0000
101+++ tests/include/mir/test/doubles/mock_main_loop.h 2016-08-10 10:50:29 +0000
102@@ -63,14 +63,14 @@
103 MOCK_METHOD1(create_alarm, std::unique_ptr<time::Alarm>(std::function<void()> const& callback));
104 MOCK_METHOD1(create_alarm, std::unique_ptr<time::Alarm>(LockableCallback* callback));
105
106- std::unique_ptr<time::Alarm> create_alarm(std::unique_ptr<LockableCallback> callback)
107+ std::unique_ptr<time::Alarm> create_alarm(std::unique_ptr<LockableCallback> callback) override
108 {
109 return create_alarm(callback.get());
110 }
111
112 void register_signal_handler(
113 std::initializer_list<int> signals,
114- mir::UniqueModulePtr<std::function<void(int)>> handler)
115+ mir::UniqueModulePtr<std::function<void(int)>> handler) override
116 {
117 register_signal_handler_module_ptr(signals, *handler);
118 }
119@@ -78,7 +78,7 @@
120 void register_fd_handler(
121 std::initializer_list<int> fds,
122 void const* owner,
123- mir::UniqueModulePtr<std::function<void(int)>> handler)
124+ mir::UniqueModulePtr<std::function<void(int)>> handler) override
125 {
126 register_fd_handler_module_ptr(fds, owner, *handler);
127 }
128
129=== modified file 'tests/include/mir/test/doubles/null_prompt_session_manager.h'
130--- tests/include/mir/test/doubles/null_prompt_session_manager.h 2015-02-22 07:46:25 +0000
131+++ tests/include/mir/test/doubles/null_prompt_session_manager.h 2016-08-10 10:50:29 +0000
132@@ -32,12 +32,12 @@
133 {
134 public:
135 std::shared_ptr<scene::PromptSession> start_prompt_session_for(std::shared_ptr<scene::Session> const&,
136- scene::PromptSessionCreationParameters const&) const
137+ scene::PromptSessionCreationParameters const&) const override
138 {
139 return std::shared_ptr<scene::PromptSession>();
140 }
141
142- void stop_prompt_session(std::shared_ptr<scene::PromptSession> const&) const
143+ void stop_prompt_session(std::shared_ptr<scene::PromptSession> const&) const override
144 {
145 }
146
147@@ -50,26 +50,26 @@
148 }
149
150 void add_prompt_provider(std::shared_ptr<scene::PromptSession> const&,
151- std::shared_ptr<scene::Session> const&) const
152- {
153- }
154-
155- void remove_session(std::shared_ptr<scene::Session> const&) const
156- {
157- }
158-
159- std::shared_ptr<scene::Session> application_for(std::shared_ptr<scene::PromptSession> const&) const
160+ std::shared_ptr<scene::Session> const&) const override
161+ {
162+ }
163+
164+ void remove_session(std::shared_ptr<scene::Session> const&) const override
165+ {
166+ }
167+
168+ std::shared_ptr<scene::Session> application_for(std::shared_ptr<scene::PromptSession> const&) const override
169 {
170 return std::shared_ptr<scene::Session>();
171 }
172
173- std::shared_ptr<scene::Session> helper_for(std::shared_ptr<scene::PromptSession> const&) const
174+ std::shared_ptr<scene::Session> helper_for(std::shared_ptr<scene::PromptSession> const&) const override
175 {
176 return std::shared_ptr<scene::Session>();
177 }
178
179 void for_each_provider_in(std::shared_ptr<scene::PromptSession> const&,
180- std::function<void(std::shared_ptr<scene::Session> const&)> const&) const
181+ std::function<void(std::shared_ptr<scene::Session> const&)> const&) const override
182 {
183 }
184 };
185
186=== modified file 'tests/include/mir/test/doubles/stub_buffer_stream.h'
187--- tests/include/mir/test/doubles/stub_buffer_stream.h 2016-05-04 01:48:16 +0000
188+++ tests/include/mir/test/doubles/stub_buffer_stream.h 2016-08-10 10:50:29 +0000
189@@ -70,18 +70,18 @@
190 if (b) ++nready;
191 complete(&stub_client_buffer);
192 }
193- void with_most_recent_buffer_do(std::function<void(graphics::Buffer&)> const& fn)
194+ void with_most_recent_buffer_do(std::function<void(graphics::Buffer&)> const& fn) override
195 {
196 thread_name = current_thread_name();
197 fn(*stub_compositor_buffer);
198 }
199- MirPixelFormat pixel_format() const { return mir_pixel_format_abgr_8888; }
200- void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) {}
201- void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) {}
202- bool has_submitted_buffer() const { return true; }
203- void associate_buffer(graphics::BufferID) {}
204- void disassociate_buffer(graphics::BufferID) {}
205- void set_scale(float) {}
206+ MirPixelFormat pixel_format() const override { return mir_pixel_format_abgr_8888; }
207+ void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override {}
208+ void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override {}
209+ bool has_submitted_buffer() const override { return true; }
210+ void associate_buffer(graphics::BufferID) override {}
211+ void disassociate_buffer(graphics::BufferID) override {}
212+ void set_scale(float) override {}
213
214 StubBuffer stub_client_buffer;
215 std::shared_ptr<graphics::Buffer> stub_compositor_buffer;
216
217=== modified file 'tests/include/mir/test/doubles/stub_client_buffer.h'
218--- tests/include/mir/test/doubles/stub_client_buffer.h 2016-08-01 07:24:32 +0000
219+++ tests/include/mir/test/doubles/stub_client_buffer.h 2016-08-10 10:50:29 +0000
220@@ -74,10 +74,10 @@
221 void update_from(MirBufferPackage const&) override {}
222 void fill_update_msg(MirBufferPackage&) override{}
223
224- MirNativeBuffer* as_mir_native_buffer() const { return nullptr; }
225- void set_fence(MirNativeFence, MirBufferAccess) {}
226- MirNativeFence get_fence() const { return nullptr; }
227- bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) { return true; }
228+ MirNativeBuffer* as_mir_native_buffer() const override { return nullptr; }
229+ void set_fence(MirNativeFence, MirBufferAccess) override {}
230+ MirNativeFence get_fence() const override { return nullptr; }
231+ bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override { return true; }
232
233 std::shared_ptr<MirBufferPackage> const package;
234 geometry::Size size_;
235
236=== modified file 'tests/include/mir/test/doubles/stub_host_connection.h'
237--- tests/include/mir/test/doubles/stub_host_connection.h 2016-06-09 13:15:34 +0000
238+++ tests/include/mir/test/doubles/stub_host_connection.h 2016-08-10 10:50:29 +0000
239@@ -73,16 +73,16 @@
240 return {{},{}};
241 }
242
243- void set_cursor_image(graphics::CursorImage const&)
244- {
245- }
246- void hide_cursor()
247- {
248- }
249-
250- auto graphics_platform_library() -> std::string { return {}; }
251-
252- graphics::nested::UniqueInputConfig create_input_device_config()
253+ void set_cursor_image(graphics::CursorImage const&) override
254+ {
255+ }
256+ void hide_cursor() override
257+ {
258+ }
259+
260+ auto graphics_platform_library() -> std::string override { return {}; }
261+
262+ graphics::nested::UniqueInputConfig create_input_device_config() override
263 {
264 return graphics::nested::UniqueInputConfig(reinterpret_cast<MirInputConfig*>(new std::vector<input::DeviceData>),
265 mir_input_config_destroy);
266
267=== modified file 'tests/include/mir/test/doubles/stub_input_scene.h'
268--- tests/include/mir/test/doubles/stub_input_scene.h 2015-02-22 07:46:25 +0000
269+++ tests/include/mir/test/doubles/stub_input_scene.h 2016-08-10 10:50:29 +0000
270@@ -33,21 +33,21 @@
271 void for_each(std::function<void(std::shared_ptr<input::Surface> const&)> const& ) override
272 {
273 }
274- void add_observer(std::shared_ptr<scene::Observer> const& /* observer */)
275+ void add_observer(std::shared_ptr<scene::Observer> const& /* observer */) override
276 {
277 }
278- void remove_observer(std::weak_ptr<scene::Observer> const& /* observer */)
279+ void remove_observer(std::weak_ptr<scene::Observer> const& /* observer */) override
280 {
281 }
282
283- void add_input_visualization(std::shared_ptr<graphics::Renderable> const& /* overlay */)
284+ void add_input_visualization(std::shared_ptr<graphics::Renderable> const& /* overlay */) override
285 {
286 }
287- void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& /* overlay */)
288+ void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& /* overlay */) override
289 {
290 }
291
292- void emit_scene_changed()
293+ void emit_scene_changed() override
294 {
295 }
296 };
297
298=== modified file 'tests/include/mir/test/doubles/stub_scene_element.h'
299--- tests/include/mir/test/doubles/stub_scene_element.h 2015-06-17 05:20:42 +0000
300+++ tests/include/mir/test/doubles/stub_scene_element.h 2016-08-10 10:50:29 +0000
301@@ -43,7 +43,7 @@
302 {
303 }
304
305- std::shared_ptr<graphics::Renderable> renderable() const
306+ std::shared_ptr<graphics::Renderable> renderable() const override
307 {
308 return renderable_;
309 }
310
311=== modified file 'tests/include/mir/test/doubles/stub_scene_surface.h'
312--- tests/include/mir/test/doubles/stub_scene_surface.h 2016-06-27 20:44:49 +0000
313+++ tests/include/mir/test/doubles/stub_scene_surface.h 2016-08-10 10:50:29 +0000
314@@ -78,7 +78,7 @@
315 void resize(geometry::Size const&) override {}
316 void set_transformation(glm::mat4 const&) override {}
317 void set_alpha(float) override {}
318- void set_orientation(MirOrientation) {}
319+ void set_orientation(MirOrientation) override {}
320
321 void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override {}
322 void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override {}
323@@ -86,8 +86,8 @@
324 void set_reception_mode(input::InputReceptionMode mode) override { input_mode = mode; }
325 void consume(MirEvent const*) override {}
326
327- void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) {}
328- std::shared_ptr<graphics::CursorImage> cursor_image() const { return {}; }
329+ void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) override {}
330+ std::shared_ptr<graphics::CursorImage> cursor_image() const override { return {}; }
331
332 void request_client_surface_close() override {}
333
334@@ -102,8 +102,8 @@
335 void set_keymap(MirInputDeviceId, std::string const&, std::string const&, std::string const&, std::string const&) override
336 {}
337
338- void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) {}
339- void rename(std::string const&) {}
340+ void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) override {}
341+ void rename(std::string const&) override {}
342 std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override { return nullptr; }
343
344 void set_confine_pointer_state(MirPointerConfinementState /*state*/) override {}
345
346=== modified file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
347--- tests/include/mir_test_framework/stub_client_platform_factory.h 2016-05-03 06:55:25 +0000
348+++ tests/include/mir_test_framework/stub_client_platform_factory.h 2016-08-10 10:50:29 +0000
349@@ -28,13 +28,13 @@
350 struct StubClientPlatform : public mir::client::ClientPlatform
351 {
352 StubClientPlatform(mir::client::ClientContext* context);
353- MirPlatformType platform_type() const;
354- void populate(MirPlatformPackage& package) const;
355+ MirPlatformType platform_type() const override;
356+ void populate(MirPlatformPackage& package) const override;
357 MirPlatformMessage* platform_operation(MirPlatformMessage const*) override;
358- std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory();
359- std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface* surface);
360- std::shared_ptr<EGLNativeDisplayType> create_egl_native_display();
361- MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const;
362+ std::shared_ptr<mir::client::ClientBufferFactory> create_buffer_factory() override;
363+ std::shared_ptr<void> create_egl_native_window(mir::client::EGLNativeSurface* surface) override;
364+ std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
365+ MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const override;
366 MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
367 mir::client::ClientContext* const context;
368 };
369
370=== modified file 'tests/integration-tests/test_buffer_scheduling.cpp'
371--- tests/integration-tests/test_buffer_scheduling.cpp 2016-06-24 17:52:00 +0000
372+++ tests/integration-tests/test_buffer_scheduling.cpp 2016-08-10 10:50:29 +0000
373@@ -112,13 +112,13 @@
374 std::bind(&BufferQueueProducer::buffer_ready, this, std::placeholders::_1));
375 }
376
377- bool can_produce()
378+ bool can_produce() override
379 {
380 std::unique_lock<decltype(mutex)> lk(mutex);
381 return buffer;
382 }
383
384- mg::BufferID current_id()
385+ mg::BufferID current_id() override
386 {
387 if (buffer)
388 return buffer->id();
389@@ -126,7 +126,7 @@
390 return mg::BufferID{INT_MAX};
391 }
392
393- void produce()
394+ void produce() override
395 {
396 mg::Buffer* b = nullptr;
397 if (can_produce())
398@@ -148,20 +148,20 @@
399 }
400 }
401
402- std::vector<BufferEntry> production_log()
403+ std::vector<BufferEntry> production_log() override
404 {
405 std::unique_lock<decltype(mutex)> lk(mutex);
406 return entries;
407 }
408
409- geom::Size last_size()
410+ geom::Size last_size() override
411 {
412 if (buffer)
413 return buffer->size();
414 return geom::Size{};
415 }
416
417- void reset_log()
418+ void reset_log() override
419 {
420 std::unique_lock<decltype(mutex)> lk(mutex);
421 return entries.clear();
422@@ -196,12 +196,12 @@
423 return b;
424 }
425
426- std::vector<BufferEntry> consumption_log()
427+ std::vector<BufferEntry> consumption_log() override
428 {
429 return entries;
430 }
431
432- geom::Size last_size()
433+ geom::Size last_size() override
434 {
435 return last_size_;
436 }
437
438=== modified file 'tests/integration-tests/test_display_server_main_loop_events.cpp'
439--- tests/integration-tests/test_display_server_main_loop_events.cpp 2016-05-03 06:55:25 +0000
440+++ tests/integration-tests/test_display_server_main_loop_events.cpp 2016-08-10 10:50:29 +0000
441@@ -91,7 +91,7 @@
442 display->for_each_display_sync_group(f);
443 }
444
445- std::unique_ptr<mg::DisplayConfiguration> configuration() const
446+ std::unique_ptr<mg::DisplayConfiguration> configuration() const override
447 {
448 return std::unique_ptr<mg::DisplayConfiguration>(
449 new mtd::NullDisplayConfiguration
450
451=== modified file 'tests/integration-tests/test_exchange_buffer.cpp'
452--- tests/integration-tests/test_exchange_buffer.cpp 2016-05-04 01:48:16 +0000
453+++ tests/integration-tests/test_exchange_buffer.cpp 2016-08-10 10:50:29 +0000
454@@ -70,7 +70,7 @@
455 {
456 }
457
458- void client_acquire(std::function<void(mg::Buffer* buffer)> complete)
459+ void client_acquire(std::function<void(mg::Buffer* buffer)> complete) override
460 {
461 std::shared_ptr<mg::Buffer> stub_buffer;
462 if (buffers_acquired < buffer_id_seq.size())
463@@ -81,22 +81,22 @@
464 client_buffers.push_back(stub_buffer);
465 complete(stub_buffer.get());
466 }
467- void client_release(mg::Buffer*) {}
468- std::shared_ptr<mg::Buffer> compositor_acquire(void const*)
469- { return std::make_shared<mtd::StubBuffer>(); }
470- void compositor_release(std::shared_ptr<mg::Buffer> const&) {}
471- std::shared_ptr<mg::Buffer> snapshot_acquire()
472- { return std::make_shared<mtd::StubBuffer>(); }
473- void snapshot_release(std::shared_ptr<mg::Buffer> const&) {}
474- mg::BufferProperties properties() const { return mg::BufferProperties{}; }
475- void allow_framedropping(bool) {}
476+ void client_release(mg::Buffer*) override {}
477+ std::shared_ptr<mg::Buffer> compositor_acquire(void const*) override
478+ { return std::make_shared<mtd::StubBuffer>(); }
479+ void compositor_release(std::shared_ptr<mg::Buffer> const&) override {}
480+ std::shared_ptr<mg::Buffer> snapshot_acquire() override
481+ { return std::make_shared<mtd::StubBuffer>(); }
482+ void snapshot_release(std::shared_ptr<mg::Buffer> const&) override {}
483+ mg::BufferProperties properties() const override { return mg::BufferProperties{}; }
484+ void allow_framedropping(bool) override {}
485 void set_mode(mc::MultiMonitorMode) override {}
486- void force_requests_to_complete() {}
487- void resize(const geom::Size&) {}
488- int buffers_ready_for_compositor(void const*) const { return 1; }
489- int buffers_free_for_client() const { return 1; }
490- void drop_old_buffers() {}
491- void drop_client_requests() {}
492+ void force_requests_to_complete() override {}
493+ void resize(const geom::Size&) override {}
494+ int buffers_ready_for_compositor(void const*) const override { return 1; }
495+ int buffers_free_for_client() const override { return 1; }
496+ void drop_old_buffers() override {}
497+ void drop_client_requests() override {}
498
499 std::vector<std::shared_ptr<mg::Buffer>> client_buffers;
500 std::vector<mg::BufferID> const buffer_id_seq;
501@@ -116,7 +116,7 @@
502 std::shared_ptr<mc::BufferStream> create_buffer_stream(
503 mf::BufferStreamId, std::shared_ptr<mf::ClientBuffers> const&, mg::BufferProperties const&) override
504 { return std::make_shared<mc::BufferStreamSurfaces>(std::make_shared<StubBundle>(buffer_id_seq)); }
505- std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&)
506+ std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&) override
507 { return nullptr; }
508 std::vector<mg::BufferID> const buffer_id_seq;
509 };
510
511=== modified file 'tests/integration-tests/test_protobuf.cpp'
512--- tests/integration-tests/test_protobuf.cpp 2016-03-30 01:12:38 +0000
513+++ tests/integration-tests/test_protobuf.cpp 2016-08-10 10:50:29 +0000
514@@ -97,7 +97,7 @@
515
516 void client_pid(int /*pid*/) override {}
517
518- bool dispatch(mfd::Invocation const& invocation, std::vector<mir::Fd> const& fds)
519+ bool dispatch(mfd::Invocation const& invocation, std::vector<mir::Fd> const& fds) override
520 {
521 if ("function" == invocation.method_name())
522 {
523@@ -181,7 +181,7 @@
524
525 std::shared_ptr<DemoConnectionCreator> demo_connection_creator;
526
527- void SetUp()
528+ void SetUp() override
529 {
530 ::demo_mir_server = &demo_mir_server;
531
532
533=== modified file 'tests/integration-tests/test_swapinterval.cpp'
534--- tests/integration-tests/test_swapinterval.cpp 2016-05-04 01:48:16 +0000
535+++ tests/integration-tests/test_swapinterval.cpp 2016-08-10 10:50:29 +0000
536@@ -79,7 +79,7 @@
537 return std::make_shared<StubBufferStream>(framedropping_enabled);
538 }
539
540- std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&)
541+ std::shared_ptr<mf::ClientBuffers> create_buffer_map(std::shared_ptr<mf::BufferSink> const&) override
542 {
543 return nullptr;
544 }
545
546=== modified file 'tests/integration-tests/test_touchspot_visualization.cpp'
547--- tests/integration-tests/test_touchspot_visualization.cpp 2016-01-29 08:18:22 +0000
548+++ tests/integration-tests/test_touchspot_visualization.cpp 2016-08-10 10:50:29 +0000
549@@ -135,7 +135,7 @@
550 server_configuration.exec();
551 }
552
553- void TearDown()
554+ void TearDown() override
555 {
556 test_complete_fence.ready();
557 server_configuration.on_exit();
558
559=== modified file 'tests/unit-tests/client/test_aging_buffer.cpp'
560--- tests/unit-tests/client/test_aging_buffer.cpp 2016-08-01 07:24:32 +0000
561+++ tests/unit-tests/client/test_aging_buffer.cpp 2016-08-10 10:50:29 +0000
562@@ -64,22 +64,22 @@
563 {
564 }
565
566- MirNativeBuffer* as_mir_native_buffer() const
567- {
568- exit(1);
569- }
570-
571- void set_fence(MirNativeFence, MirBufferAccess)
572- {
573- exit(1);
574- }
575-
576- MirNativeFence get_fence() const
577- {
578- exit(1);
579- }
580-
581- bool wait_fence(MirBufferAccess, std::chrono::nanoseconds)
582+ MirNativeBuffer* as_mir_native_buffer() const override
583+ {
584+ exit(1);
585+ }
586+
587+ void set_fence(MirNativeFence, MirBufferAccess) override
588+ {
589+ exit(1);
590+ }
591+
592+ MirNativeFence get_fence() const override
593+ {
594+ exit(1);
595+ }
596+
597+ bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override
598 {
599 exit(1);
600 }
601
602=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
603--- tests/unit-tests/client/test_client_buffer_stream.cpp 2016-06-02 11:19:25 +0000
604+++ tests/unit-tests/client/test_client_buffer_stream.cpp 2016-08-10 10:50:29 +0000
605@@ -88,7 +88,7 @@
606 {
607 return buffer_factory;
608 }
609- MirPlatformMessage* platform_operation(MirPlatformMessage const* /* request */)
610+ MirPlatformMessage* platform_operation(MirPlatformMessage const* /* request */) override
611 {
612 return nullptr;
613 }
614
615=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
616--- tests/unit-tests/client/test_client_mir_surface.cpp 2016-06-08 12:30:14 +0000
617+++ tests/unit-tests/client/test_client_mir_surface.cpp 2016-08-10 10:50:29 +0000
618@@ -108,7 +108,7 @@
619 void release_surface(
620 const mir::protobuf::SurfaceId*,
621 mir::protobuf::Void*,
622- google::protobuf::Closure* done)
623+ google::protobuf::Closure* done) override
624 {
625 done->Run();
626 }
627@@ -125,7 +125,7 @@
628 void modify_surface(
629 const mir::protobuf::SurfaceModifications*,
630 mir::protobuf::Void*,
631- google::protobuf::Closure* done)
632+ google::protobuf::Closure* done) override
633 {
634 done->Run();
635 }
636
637=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
638--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2016-06-24 17:52:00 +0000
639+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2016-08-10 10:50:29 +0000
640@@ -88,14 +88,14 @@
641 void insert(mir::frontend::BufferStreamId, std::shared_ptr<MirPresentationChain> const&)
642 {
643 }
644- std::shared_ptr<mcl::MirBuffer> buffer(int) const
645+ std::shared_ptr<mcl::MirBuffer> buffer(int) const override
646 {
647 return nullptr;
648 }
649- void insert(int, std::shared_ptr<mcl::MirBuffer> const&)
650+ void insert(int, std::shared_ptr<mcl::MirBuffer> const&) override
651 {
652 }
653- void erase(int)
654+ void erase(int) override
655 {
656 }
657 };
658
659=== modified file 'tests/unit-tests/compositor/test_multi_threaded_compositor.cpp'
660--- tests/unit-tests/compositor/test_multi_threaded_compositor.cpp 2016-05-03 06:55:25 +0000
661+++ tests/unit-tests/compositor/test_multi_threaded_compositor.cpp 2016-08-10 10:50:29 +0000
662@@ -101,7 +101,7 @@
663 {
664 }
665
666- void add_observer(std::shared_ptr<ms::Observer> const& observer_)
667+ void add_observer(std::shared_ptr<ms::Observer> const& observer_) override
668 {
669 std::lock_guard<std::mutex> lock{observer_mutex};
670
671@@ -112,7 +112,7 @@
672 observer = observer_;
673 }
674
675- void remove_observer(std::weak_ptr<ms::Observer> const& /* observer */)
676+ void remove_observer(std::weak_ptr<ms::Observer> const& /* observer */) override
677 {
678 std::lock_guard<std::mutex> lock{observer_mutex};
679 observer.reset();
680
681=== modified file 'tests/unit-tests/frontend/test_protobuf_message_processor.cpp'
682--- tests/unit-tests/frontend/test_protobuf_message_processor.cpp 2016-01-29 08:18:22 +0000
683+++ tests/unit-tests/frontend/test_protobuf_message_processor.cpp 2016-08-10 10:50:29 +0000
684@@ -76,7 +76,7 @@
685 void create_surface(
686 mp::SurfaceParameters const*,
687 mp::Surface* response,
688- google::protobuf::Closure* closure)
689+ google::protobuf::Closure* closure) override
690 {
691 response->mutable_buffer_stream();
692 auto before = response->buffer_stream().has_buffer();
693@@ -88,7 +88,7 @@
694 void create_buffer_stream(
695 mp::BufferStreamParameters const*,
696 mp::BufferStream* response,
697- google::protobuf::Closure* closure)
698+ google::protobuf::Closure* closure) override
699 {
700 auto before = response->has_buffer();
701 closure->Run();
702
703=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
704--- tests/unit-tests/frontend/test_session_mediator.cpp 2016-08-01 09:03:52 +0000
705+++ tests/unit-tests/frontend/test_session_mediator.cpp 2016-08-10 10:50:29 +0000
706@@ -119,7 +119,7 @@
707 ON_CALL(*this, destroy_buffer(_))
708 .WillByDefault(Invoke([this](mg::BufferID){ ++destroy_buffers;}));
709 }
710- std::shared_ptr<mf::Surface> get_surface(mf::SurfaceId surface) const
711+ std::shared_ptr<mf::Surface> get_surface(mf::SurfaceId surface) const override
712 {
713 if (mock_surfaces.find(surface) == mock_surfaces.end())
714 BOOST_THROW_EXCEPTION(std::logic_error("Invalid SurfaceId"));
715@@ -176,7 +176,7 @@
716
717 mf::SurfaceId create_surface(
718 ms::SurfaceCreationParameters const&,
719- std::shared_ptr<mf::EventSink> const&)
720+ std::shared_ptr<mf::EventSink> const&) override
721 {
722 mf::SurfaceId id{last_surface_id};
723 if (mock_surfaces.end() == mock_surfaces.find(id))
724@@ -185,7 +185,7 @@
725 return id;
726 }
727
728- mf::BufferStreamId create_buffer_stream(mg::BufferProperties const&)
729+ mf::BufferStreamId create_buffer_stream(mg::BufferProperties const&) override
730 {
731 mf::BufferStreamId id{last_stream_id};
732 if (mock_streams.end() == mock_streams.find(id))
733@@ -194,13 +194,13 @@
734 return id;
735 }
736
737- void destroy_surface(mf::SurfaceId surface)
738+ void destroy_surface(mf::SurfaceId surface) override
739 {
740 mock_surfaces.erase(surface);
741 }
742
743
744- mg::BufferID create_buffer(mg::BufferProperties const&)
745+ mg::BufferID create_buffer(mg::BufferProperties const&) override
746 {
747 buffer_count++;
748 return mg::BufferID{3};
749
750=== modified file 'tests/unit-tests/graphics/test_overlapping_output_grouping.cpp'
751--- tests/unit-tests/graphics/test_overlapping_output_grouping.cpp 2016-01-29 08:18:22 +0000
752+++ tests/unit-tests/graphics/test_overlapping_output_grouping.cpp 2016-08-10 10:50:29 +0000
753@@ -60,7 +60,7 @@
754 {
755 }
756
757- void for_each_card(std::function<void(mg::DisplayConfigurationCard const&)> f) const
758+ void for_each_card(std::function<void(mg::DisplayConfigurationCard const&)> f) const override
759 {
760 mg::DisplayConfigurationCard card
761 {
762@@ -71,7 +71,7 @@
763 f(card);
764 }
765
766- void for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)> f) const
767+ void for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)> f) const override
768 {
769 uint32_t i = 1;
770 for (auto const& info : outputs)
771
772=== modified file 'tests/unit-tests/scene/test_application_session.cpp'
773--- tests/unit-tests/scene/test_application_session.cpp 2016-06-02 05:33:50 +0000
774+++ tests/unit-tests/scene/test_application_session.cpp 2016-08-10 10:50:29 +0000
775@@ -130,7 +130,7 @@
776 void remove_surface(std::weak_ptr<ms::Surface> const&) override
777 {
778 }
779- auto surface_at(mir::geometry::Point) const -> std::shared_ptr<ms::Surface>
780+ auto surface_at(mir::geometry::Point) const -> std::shared_ptr<ms::Surface> override
781 {
782 return std::shared_ptr<ms::Surface>{};
783 }

Subscribers

People subscribed via source and target branches