Mir

Merge lp:~vanvugt/mir/fix-1614983 into lp:mir

  1. fix-1614983
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 3667
Proposed branch: lp:~vanvugt/mir/fix-1614983
Merge into: lp:mir
Diff against target: 183 lines (+23/-31)
8 files modified
include/server/mir/compositor/scene.h (+1/-1)
include/server/mir/scene/surface.h (+1/-1)
include/test/mir/test/doubles/mock_display_configuration.h (+4/-4)
include/test/mir_test_framework/fake_input_device.h (+4/-5)
include/test/mir_test_framework/stub_server_platform_factory.h (+2/-10)
tests/acceptance-tests/test_nested_input.cpp (+1/-1)
tests/mir_test_framework/fake_input_device_impl.cpp (+1/-0)
tests/mir_test_framework/fake_input_device_impl.h (+9/-9)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1614983
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve
Mir CI Bot continuous-integration Needs Fixing
Chris Halse Rogers Approve
Alan Griffiths Approve
Review via email: mp+303507@code.launchpad.net

Commit message

Don't use namespace aliases in public headers (LP: #1614983)

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3661
https://mir-jenkins.ubuntu.com/job/mir-ci/1500/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1865/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1919
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1910
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1910
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1910
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1889/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1889
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1889/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1889
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1889/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1889/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1889/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/1889
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1889/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/1889
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1889/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
Chris Halse Rogers (raof) wrote :

Seems sensible

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Needs a fresh review due to additional changes. Or else autolanding will fail :P

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3664
https://mir-jenkins.ubuntu.com/job/mir-ci/1507/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1881/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1941
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1932
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1932
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1932
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1905
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1905/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/1905
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1905/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1905
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1905/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1905/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1905/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/1905
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1905/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/1905
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1905/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

^^^
Bug 1615512

Getting rather annoyed now.

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3665
https://mir-jenkins.ubuntu.com/job/mir-ci/1509/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1883/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1943
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1934
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1934
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1934
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1907
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1907/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/1907
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1907/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1907/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1907/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1907/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/1907
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1907/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/1907
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1907/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

^^^
06:11:25 cc1plus: error: invalid argument '/build/mir' to -fdebug-prefix-map

and

Triggering device-runtests-mir ? krillin
device-runtests-mir ? krillin completed with result ABORTED
Finished: ABORTED

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3666
https://mir-jenkins.ubuntu.com/job/mir-ci/1513/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1893/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1953
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1944
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1944
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1944
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1917/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/1917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1917/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1917/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1917/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1917/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/1917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1917/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/1917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1917/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

^^^
Only krillin device failure. That's an improvement :)

Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm too

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/server/mir/compositor/scene.h'
2--- include/server/mir/compositor/scene.h 2015-02-22 07:46:25 +0000
3+++ include/server/mir/compositor/scene.h 2016-08-24 02:15:46 +0000
4@@ -50,7 +50,7 @@
5 * a new (different) sequence to that user each time. For
6 * consistency, all callers need to determine their id
7 * in the same way (e.g. always use "this" pointer).
8- * \returns a sequence of mc::SceneElements for the compositor id. The
9+ * \returns a sequence of SceneElements for the compositor id. The
10 * sequence is in stacking order from back to front.
11 */
12 virtual SceneElementSequence scene_elements_for(CompositorID id) = 0;
13
14=== modified file 'include/server/mir/scene/surface.h'
15--- include/server/mir/scene/surface.h 2016-06-27 20:44:49 +0000
16+++ include/server/mir/scene/surface.h 2016-08-24 02:15:46 +0000
17@@ -84,7 +84,7 @@
18 * By default the input region is the whole surface. To unset a custom input region
19 * and revert to the default set an empty input region, i.e., set_input_region({}).
20 * To disable input set a non-empty region containing an empty rectangle, i.e.,
21- * set_input_region({geom::Rectangle{}}).
22+ * set_input_region({Rectangle{}}).
23 */
24 virtual void set_input_region(std::vector<geometry::Rectangle> const& region) = 0;
25 virtual void resize(geometry::Size const& size) = 0;
26
27=== modified file 'include/test/mir/test/doubles/mock_display_configuration.h'
28--- include/test/mir/test/doubles/mock_display_configuration.h 2015-10-30 11:07:02 +0000
29+++ include/test/mir/test/doubles/mock_display_configuration.h 2016-08-24 02:15:46 +0000
30@@ -32,19 +32,19 @@
31 {
32 MOCK_CONST_METHOD1(
33 for_each_card,
34- void(std::function<void(mg::DisplayConfigurationCard const&)>));
35+ void(std::function<void(graphics::DisplayConfigurationCard const&)>));
36
37 MOCK_CONST_METHOD1(
38 for_each_output,
39- void(std::function<void(mg::DisplayConfigurationOutput const&)>));
40+ void(std::function<void(graphics::DisplayConfigurationOutput const&)>));
41
42 MOCK_METHOD1(
43 for_each_output,
44- void(std::function<void(mg::UserDisplayConfigurationOutput&)>));
45+ void(std::function<void(graphics::UserDisplayConfigurationOutput&)>));
46
47 MOCK_CONST_METHOD0(valid, bool());
48
49- std::unique_ptr<mg::DisplayConfiguration> clone() const
50+ std::unique_ptr<graphics::DisplayConfiguration> clone() const
51 {
52 throw std::runtime_error("MockDisplayConfiguration::clone is not implemented");
53 }
54
55=== modified file 'include/test/mir_test_framework/fake_input_device.h'
56--- include/test/mir_test_framework/fake_input_device.h 2016-05-03 06:55:25 +0000
57+++ include/test/mir_test_framework/fake_input_device.h 2016-08-24 02:15:46 +0000
58@@ -24,7 +24,6 @@
59
60 namespace mir_test_framework
61 {
62-namespace synthesis = mir::input::synthesis;
63
64 class FakeInputDevice
65 {
66@@ -44,10 +43,10 @@
67
68 virtual void emit_device_removal() = 0;
69 virtual void emit_runtime_error() = 0;
70- virtual void emit_event(synthesis::KeyParameters const& key) = 0;
71- virtual void emit_event(synthesis::ButtonParameters const& button) = 0;
72- virtual void emit_event(synthesis::MotionParameters const& motion) = 0;
73- virtual void emit_event(synthesis::TouchParameters const& touch) = 0;
74+ virtual void emit_event(mir::input::synthesis::KeyParameters const& key) = 0;
75+ virtual void emit_event(mir::input::synthesis::ButtonParameters const& button) = 0;
76+ virtual void emit_event(mir::input::synthesis::MotionParameters const& motion) = 0;
77+ virtual void emit_event(mir::input::synthesis::TouchParameters const& touch) = 0;
78
79 FakeInputDevice(FakeInputDevice const&) = delete;
80 FakeInputDevice& operator=(FakeInputDevice const&) = delete;
81
82=== modified file 'include/test/mir_test_framework/stub_server_platform_factory.h'
83--- include/test/mir_test_framework/stub_server_platform_factory.h 2016-01-29 08:18:22 +0000
84+++ include/test/mir_test_framework/stub_server_platform_factory.h 2016-08-24 02:15:46 +0000
85@@ -27,29 +27,21 @@
86 #include <memory>
87 #include <string>
88
89-namespace geom = mir::geometry;
90-
91 namespace mir
92 {
93-namespace graphics
94-{
95-class Platform;
96-}
97 namespace input
98 {
99 class InputDeviceInfo;
100 }
101 }
102
103-namespace mg = mir::graphics;
104-
105 namespace mir_test_framework
106 {
107 class FakeInputDevice;
108
109-std::shared_ptr<mg::Platform> make_stubbed_server_graphics_platform(std::vector<geom::Rectangle> const& display_rects);
110+std::shared_ptr<mir::graphics::Platform> make_stubbed_server_graphics_platform(std::vector<mir::geometry::Rectangle> const& display_rects);
111
112-void set_next_display_rects(std::unique_ptr<std::vector<geom::Rectangle>>&& display_rects);
113+void set_next_display_rects(std::unique_ptr<std::vector<mir::geometry::Rectangle>>&& display_rects);
114
115 void set_next_preset_display(std::shared_ptr<mir::graphics::Display> const& display);
116
117
118=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
119--- tests/acceptance-tests/test_nested_input.cpp 2016-07-20 04:54:07 +0000
120+++ tests/acceptance-tests/test_nested_input.cpp 2016-08-24 02:15:46 +0000
121@@ -67,7 +67,7 @@
122 }
123 };
124
125-std::vector<geom::Rectangle> const display_geometry
126+std::vector<mir::geometry::Rectangle> const display_geometry
127 {
128 {{ 0, 0}, { 640, 480}},
129 {{480, 0}, {1920, 1080}}
130
131=== modified file 'tests/mir_test_framework/fake_input_device_impl.cpp'
132--- tests/mir_test_framework/fake_input_device_impl.cpp 2016-05-03 06:55:25 +0000
133+++ tests/mir_test_framework/fake_input_device_impl.cpp 2016-08-24 02:15:46 +0000
134@@ -39,6 +39,7 @@
135 namespace mie = mi::evdev;
136 namespace md = mir::dispatch;
137 namespace mtf = mir_test_framework;
138+namespace synthesis = mir::input::synthesis;
139
140 mtf::FakeInputDeviceImpl::FakeInputDeviceImpl(mi::InputDeviceInfo const& info)
141 : queue{std::make_shared<md::ActionQueue>()}, device{std::make_shared<InputDevice>(info, queue)}
142
143=== modified file 'tests/mir_test_framework/fake_input_device_impl.h'
144--- tests/mir_test_framework/fake_input_device_impl.h 2016-05-03 06:55:25 +0000
145+++ tests/mir_test_framework/fake_input_device_impl.h 2016-08-24 02:15:46 +0000
146@@ -42,10 +42,10 @@
147 FakeInputDeviceImpl(mir::input::InputDeviceInfo const& info);
148 void emit_device_removal() override;
149 void emit_runtime_error() override;
150- void emit_event(synthesis::KeyParameters const& key_params) override;
151- void emit_event(synthesis::ButtonParameters const& button) override;
152- void emit_event(synthesis::MotionParameters const& motion) override;
153- void emit_event(synthesis::TouchParameters const& touch) override;
154+ void emit_event(mir::input::synthesis::KeyParameters const& key_params) override;
155+ void emit_event(mir::input::synthesis::ButtonParameters const& button) override;
156+ void emit_event(mir::input::synthesis::MotionParameters const& motion) override;
157+ void emit_event(mir::input::synthesis::TouchParameters const& touch) override;
158
159 private:
160 class InputDevice : public mir::input::InputDevice
161@@ -57,10 +57,10 @@
162 void start(mir::input::InputSink* destination, mir::input::EventBuilder* builder) override;
163 void stop() override;
164
165- void synthesize_events(synthesis::KeyParameters const& key_params);
166- void synthesize_events(synthesis::ButtonParameters const& button);
167- void synthesize_events(synthesis::MotionParameters const& motion);
168- void synthesize_events(synthesis::TouchParameters const& touch);
169+ void synthesize_events(mir::input::synthesis::KeyParameters const& key_params);
170+ void synthesize_events(mir::input::synthesis::ButtonParameters const& button);
171+ void synthesize_events(mir::input::synthesis::MotionParameters const& motion);
172+ void synthesize_events(mir::input::synthesis::TouchParameters const& touch);
173 mir::input::InputDeviceInfo get_device_info() override
174 {
175 return info;
176@@ -72,7 +72,7 @@
177 void apply_settings(mir::input::TouchpadSettings const& settings) override;
178
179 private:
180- MirPointerAction update_buttons(synthesis::EventAction action, MirPointerButton button);
181+ MirPointerAction update_buttons(mir::input::synthesis::EventAction action, MirPointerButton button);
182 void update_position(int rel_x, int rel_y);
183 void map_touch_coordinates(float& x, float& y);
184

Subscribers

People subscribed via source and target branches