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

[Daniel van Vugt]

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

[Mir CI Bot (mir-ci-bot)]

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)]

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

review: Approve

=== 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 @@
 #include "mir_test_framework/connected_client_headless_server.h"
 #include "mir_test_framework/stub_platform_extension.h"
 #include "mir_toolkit/mir_extension_core.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 namespace mtf = mir_test_framework;
 using namespace testing;