Mir

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

Proposed by Daniel van Vugt on 2016-11-17
Status: Merged
Approved by: Alan Griffiths on 2016-11-17
Approved revision: 3826
Merged at revision: 3830
Proposed branch: lp:~vanvugt/mir/fix-1642473
Merge into: lp:mir
Diff against target: 12 lines (+2/-0)
1 file modified
tests/acceptance-tests/test_client_extensions.cpp (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1642473
Reviewer Review Type Date Requested Status
Alan Griffiths 2016-11-17 Approve on 2016-11-17
Mir CI Bot continuous-integration Approve on 2016-11-17
Review via email: mp+311107@code.launchpad.net

Commit message

Add missing #includes which strangely only caused build failures
when cross compiling!? (LP: #1642473)

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

PASSED: Continuous integration, rev:3826
https://mir-jenkins.ubuntu.com/job/mir-ci/2197/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2843
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2908
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2900
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2900
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2900
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2872
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2872/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/2872
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2872/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2872
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2872/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/2872
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2872/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/2872
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2872/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/2872
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2872/artifact/output/*zip*/output.zip

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

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

Using pre-compiled headers by default means we can miss these.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/acceptance-tests/test_client_extensions.cpp'
--- tests/acceptance-tests/test_client_extensions.cpp 2016-11-07 19:02:29 +0000
+++ tests/acceptance-tests/test_client_extensions.cpp 2016-11-17 06:07:11 +0000
@@ -19,6 +19,8 @@
19#include "mir_test_framework/connected_client_headless_server.h"19#include "mir_test_framework/connected_client_headless_server.h"
20#include "mir_test_framework/stub_platform_extension.h"20#include "mir_test_framework/stub_platform_extension.h"
21#include "mir_toolkit/mir_extension_core.h"21#include "mir_toolkit/mir_extension_core.h"
22#include <gtest/gtest.h>
23#include <gmock/gmock.h>
2224
23namespace mtf = mir_test_framework;25namespace mtf = mir_test_framework;
24using namespace testing;26using namespace testing;

Subscribers

People subscribed via source and target branches