Mir

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

Proposed by Daniel van Vugt on 2017-01-23
Status: Merged
Approved by: Andreas Pokorny on 2017-01-23
Approved revision: 3969
Merged at revision: 3969
Proposed branch: lp:~vanvugt/mir/fix-1658605
Merge into: lp:mir
Diff against target: 11 lines (+1/-0)
1 file modified
include/test/mir/test/doubles/mock_input_device_hub.h (+1/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1658605
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-01-23
Andreas Pokorny (community) 2017-01-23 Approve on 2017-01-23
Review via email: mp+315329@code.launchpad.net

Commit message

Add a missing #include (LP: #1658605)

To post a comment you must log in.
Andreas Pokorny (andreas-pokorny) wrote :

sure

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

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

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

review: Needs Fixing (continuous-integration)
Daniel van Vugt (vanvugt) wrote :
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 'include/test/mir/test/doubles/mock_input_device_hub.h'
2--- include/test/mir/test/doubles/mock_input_device_hub.h 2017-01-19 09:38:52 +0000
3+++ include/test/mir/test/doubles/mock_input_device_hub.h 2017-01-23 07:57:53 +0000
4@@ -20,6 +20,7 @@
5 #define MIR_TEST_DOUBLES_MOCK_INPUT_DEVICE_HUB_H_
6
7 #include "mir/input/input_device_hub.h"
8+#include <gmock/gmock.h>
9
10 namespace mir
11 {

Subscribers

People subscribed via source and target branches