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

[Daniel van Vugt]

Don't hide the mtd alias in Mesa-only builds like ppc64 (LP: #1522122)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3166
http://jenkins.qa.ubuntu.com/job/mir-ci/5759/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5124
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/87/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5124
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7654
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25759
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/85/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5759/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm, thanks!

review: Approve

=== modified file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	2015-11-19 05:01:36 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2015-12-03 08:15:20 +0000
@@ -31,12 +31,12 @@
 
 #ifdef MIR_BUILD_PLATFORM_ANDROID
 #include "mir/test/doubles/mock_android_hw.h"
-namespace mtd = mir::test::doubles;
 #endif
 
 #include "mir_test_framework/udev_environment.h"
 #include "mir_test_framework/executable_path.h"
 
+namespace mtd = mir::test::doubles;
 namespace mtf = mir_test_framework;
 
 namespace