Mir

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

Proposed by Alan Griffiths on 2016-09-12
Status: Merged
Approved by: Alan Griffiths on 2016-09-12
Approved revision: 3697
Merged at revision: 3698
Proposed branch: lp:~alan-griffiths/mir/fix-1621917
Merge into: lp:mir
Diff against target: 39 lines (+3/-3)
3 files modified
tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp (+1/-1)
tests/mir_test_framework/headless_nested_server_runner.cpp (+1/-1)
tests/mir_test_framework/headless_test.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1621917
Reviewer Review Type Date Requested Status
Kevin DuBois (community) 2016-09-12 Approve on 2016-09-12
Mir CI Bot continuous-integration Approve on 2016-09-12
Review via email: mp+305439@code.launchpad.net

Commit message

Publish test stub: HeadlessDisplayBufferCompositorFactory

Description of the change

Publish test stub: HeadlessDisplayBufferCompositorFactory

This is needed for use in downstream lp:miral (miral::TestServer)

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

PASSED: Continuous integration, rev:3697
https://mir-jenkins.ubuntu.com/job/mir-ci/1689/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2114
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2176
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2167
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2167
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2167
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2142
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2142/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/2142
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2142/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2142
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2142/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/2142
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2142/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/2142
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2142/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Kevin DuBois (kdub) wrote :

alright

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'tests/mir_test_framework/headless_display_buffer_compositor_factory.h' => 'include/test/mir_test_framework/headless_display_buffer_compositor_factory.h'
2=== modified file 'tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp'
3--- tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp 2016-08-26 19:01:27 +0000
4+++ tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp 2016-09-12 08:23:20 +0000
5@@ -16,7 +16,7 @@
6 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
7 */
8
9-#include "headless_display_buffer_compositor_factory.h"
10+#include "mir_test_framework/headless_display_buffer_compositor_factory.h"
11 #include "mir/renderer/gl/render_target.h"
12 #include "mir/graphics/display_buffer.h"
13 #include "mir/compositor/display_buffer_compositor.h"
14
15=== modified file 'tests/mir_test_framework/headless_nested_server_runner.cpp'
16--- tests/mir_test_framework/headless_nested_server_runner.cpp 2016-08-26 17:19:42 +0000
17+++ tests/mir_test_framework/headless_nested_server_runner.cpp 2016-09-12 08:23:20 +0000
18@@ -18,7 +18,7 @@
19
20 #include "mir_test_framework/headless_nested_server_runner.h"
21 #include "mir_test_framework/executable_path.h"
22-#include "headless_display_buffer_compositor_factory.h"
23+#include "mir_test_framework/headless_display_buffer_compositor_factory.h"
24
25 namespace mtf = mir_test_framework;
26
27
28=== modified file 'tests/mir_test_framework/headless_test.cpp'
29--- tests/mir_test_framework/headless_test.cpp 2016-08-26 17:19:42 +0000
30+++ tests/mir_test_framework/headless_test.cpp 2016-09-12 08:23:20 +0000
31@@ -18,7 +18,7 @@
32
33 #include "mir_test_framework/headless_test.h"
34 #include "mir_test_framework/stub_server_platform_factory.h"
35-#include "headless_display_buffer_compositor_factory.h"
36+#include "mir_test_framework/headless_display_buffer_compositor_factory.h"
37
38 #include "mir/shared_library.h"
39 #include "mir/geometry/rectangle.h"

Subscribers

People subscribed via source and target branches