Merge lp:~raof/mir/privatise-all-the-things into lp:mir

[Chris Halse Rogers]

Move the platform plugins into a private directory, versioned with the relevant ABI.

Together with Alan's versioning of libmirplatform, makes different versions of Mir parallel installable again.

Fixes: https://bugs.launchpad.net/mir/+bug/1293944

Move the platform plugins into a private directory, versioned with the relevant ABI.

There are some obvious TODOs here, but none seem super-urgent:
*) Actually managing the lifetime of our platform plugins rather than just keeping them around indefinitely
*) Defining an ABI we expose to platform plugins and then sticking them in an unversioned directory.
*) Loading the specific version of the ABI we expect via dlvsym.

Things that I'll do as an immediate follow-on branch:
*) Logging for platform module probing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1801
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2265/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/787/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/788/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/60/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2265/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

How does removing libmirplatform fits with our "platform" story?

AIUI libmirplatform is the LGPL foundation (establishing common interfaces & types) that both a propitiatory platform implementation and the GPL libmirserver link against.

How is that seen to work after these changes?

review: Needs Information

[Alexandros Frantzis (afrantzis)]

Besides the conflicts:

42 +Package: libmirplatformgraphics-mesa-24

Debian packaging guidelines mandate lib<name><version>, so e.g. libmirclientplatform-mesa8 for the package names. The extra dash before the version is only used if the name ends with a number.

225 -override_dh_install:
231 -override_dh_installdeb:
787 + // TODO: Some sort of probe so we have some guarantee that

We need to check if removing alternatives support breaks the emulator use case (which was the driving force behing it). In general, until we have a smart enough probe, we either need to allow setting a sensible system-wide default (that's what the current alternatives system does), or disallow installing the mesa/android packages at the same time (which somewhat defeats the purpose of this MP).

2173 +std::list<std::shared_ptr<mir::SharedLibrary>>

Prefer vector<> by default (not that it will makes any performance different in this case).

review: Needs Fixing

[Kevin DuBois (kdub)]

the define MIR_SERVER_PLATFORM_PLUGIN_PATH makes me a little leary (esp with the various cross compiling methods floating around. Could we use a some default paths instead?

review: Needs Information

[Chris Halse Rogers (raof)]

> How does removing libmirplatform fits with our "platform" story?
>
> AIUI libmirplatform is the LGPL foundation (establishing common interfaces &
> types) that both a propitiatory platform implementation and the GPL
> libmirserver link against.
>
> How is that seen to work after these changes?

Roughly the same as it was working before these changes - if, for example, you check out libmirplatform in trunk then you'll see it exports a single symbol - mir::load_library - which I removed and then noticed that nothing was actually linked against libmirplatform (because we pass the linker flag to only link against things that we use symbols from).

Thinking of which, have we checked with our lawyers and/or NVIDIA's/AMD's lawyers about this? The situation is more like loadable modules in the kernel rather than traditional dynamic linking, and it'd be nice to be clearer about our expectations than the kernel is.

> Besides the conflicts:
>
> 42 +Package: libmirplatformgraphics-mesa-24
>
> Debian packaging guidelines mandate lib<name><version>, so e.g.
> libmirclientplatform-mesa8 for the package names. The extra dash before the
> version is only used if the name ends with a number.

Ah, yeah. I'll actually go the other way - this isn't a shared library, it's a module, so I'll rename it mir-platform-graphics-mesa-24 (see also: Xserver versioning)

> 787 + // TODO: Some sort of probe so we have some guarantee that
>
> We need to check if removing alternatives support breaks the emulator use case
> (which was the driving force behing it). In general, until we have a smart
> enough probe, we either need to allow setting a sensible system-wide default
> (that's what the current alternatives system does), or disallow installing the
> mesa/android packages at the same time (which somewhat defeats the purpose of
> this MP).

It shouldn't be too hard to get a basic probe up and running. I'll do so.

>
> 2173 +std::list<std::shared_ptr<mir::SharedLibrary>>
>
> Prefer vector<> by default (not that it will makes any performance different
> in this case).

Ah, yeah. This was a holdover of trying to use raw mir::SharedLibrary which isn't default-constructible.

> the define MIR_SERVER_PLATFORM_PLUGIN_PATH makes me a little leary (esp with
> the various cross compiling methods floating around. Could we use a some
> default paths instead?

I'm not entirely clear what you're concerned about here. Is your concern about testability? That should be mitigated by the MIR_CLIENT_PLATFORM_LIBRARY and MIR_SERVER_PLATFORM_LIBRARY environment overrides, which we need to use in the tests anyway?

[Alan Griffiths (alan-griffiths)]

> > How does removing libmirplatform fits with our "platform" story?
> >
> > AIUI libmirplatform is the LGPL foundation (establishing common interfaces &
> > types) that both a propitiatory platform implementation and the GPL
> > libmirserver link against.
> >
> > How is that seen to work after these changes?
>
> Roughly the same as it was working before these changes - if, for example, you
> check out libmirplatform in trunk then you'll see it exports a single symbol -
> mir::load_library - which I removed and then noticed that nothing was actually
> linked against libmirplatform (because we pass the linker flag to only link
> against things that we use symbols from).
>
> Thinking of which, have we checked with our lawyers and/or NVIDIA's/AMD's
> lawyers about this? The situation is more like loadable modules in the kernel
> rather than traditional dynamic linking, and it'd be nice to be clearer about
> our expectations than the kernel is.

I wasn't party to the conversations with lawyers, I'm going on what kgunn told us.

[Alan Griffiths (alan-griffiths)]

> Roughly the same as it was working before these changes - if, for example, you
> check out libmirplatform in trunk then you'll see it exports a single symbol -
> mir::load_library - which I removed and then noticed that nothing was actually
> linked against libmirplatform (because we pass the linker flag to only link
> against things that we use symbols from).

That bug and has been fixed on development-branch (-r 1786)

[Chris Halse Rogers (raof)]

Moving to WIP: probing is taking a little longer than expected. Hah!

[Alan Griffiths (alan-griffiths)]

Interesting approach. Not a complete review but:

1607 +#include <iostream>

Not needed

~~~~

3961 -#ifdef ANDROID
3962 #include "mir_test_doubles/mock_android_hw.h"
3963 -#include "src/client/android/client_platform_factory.h"

Causes FTBFS for me on desktop:

include/test/mir_test_doubles/mock_android_alloc_device.h:26:30: fatal error: hardware/gralloc.h: No such file or directory
 #include <hardware/gralloc.h>
                              ^
compilation terminated.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1826
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2335/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1234
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1240/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/857/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/858/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/158/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2335/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1827
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2344/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/866/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/867/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/173/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2344/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1829
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2348/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1253
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/870/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/871/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/177/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2348/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1831
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2351/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1264
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1247/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/873/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/874/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/182/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2351/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1832
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2355/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1270
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1253/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/877/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/878/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/188/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2355/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1833
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1272
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/878/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/879/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/190/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2356/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1835
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2375/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1303/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1285/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/898/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/221/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2375/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1836
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2376/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1298
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1304/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1286
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/898/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/899
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/899/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/222
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/222/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2378
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11365

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2376/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1837
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2392/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1327/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1306/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/914/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/915/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/243/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2392/rebuild

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

review: Abstain

[Alexandros Frantzis (afrantzis)]

Didn't get a chance to review properly.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1838
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2405/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1338
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1344/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1322/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/927/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/928
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/928/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/259
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/259/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2407/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11526

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2405/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1839
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2406/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1347
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1324/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/928/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/929
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/929/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/261
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/261/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2409/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11532

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2406/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> [ RUN ] SurfaceLoop.all_created_buffers_are_destroyed
> Build timed out (after 60 minutes). Marking the build as failed.

Sometimes tests hang. Sometimes CI is this slow. Who knows?!

~~~~

1204 +std::shared_ptr<mcl::ProbingClientPlatformFactory> the_platform_prober;

Having recently tracked down several problems caused by namespace scoped objects with state I'm concerned that this may be fragile.

~~~~

Triggering rebuild to see if it it gets through CI - will come back for a closer look later.

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1839
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2437/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1382/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1388/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1365/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/959/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/960/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/302/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2437/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1840
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2453/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1405
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1411/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1388/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/975/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/325/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2453/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1841
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2457/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1415
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1392/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/979/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/329
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/329/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2475/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11892

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2457/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1842
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2468/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1426
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1405/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/990
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/990/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/342
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/342/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2483/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11947

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2468/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1843
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2481/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1434/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1440/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1003/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/356/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2481/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1844
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2482/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1441
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1420/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1004
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1004/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/357
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/357/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2497/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12008

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2482/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Minor suggestion: Try reverting all the blank line changes. That will get the diff size down to below the 5000 line limit so Launchpad will display it all.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1844
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2489/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1448
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1427/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1011
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1011/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/364
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/364/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2508/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12024

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2489/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1844
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2501/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1458/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1464/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1443/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1023/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/380/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2501/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1845
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2503/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1461/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1467/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1446/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1025/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/383/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2503/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1847
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2504/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1447
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1026/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/384
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/384/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2528
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12084

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2504/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1845
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2505/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1469
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1448/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1027
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1027/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/385/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2505/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Ok. I don't know what's going on with CI.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1845
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2507/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1029
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1029/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/387
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/387/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2536
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12094

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2507/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1845
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1030
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1030/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/389
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/389/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2538
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12096

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2508/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

I suggest trying to shrink the diff down to 5000 lines so LP will not truncate it. Also resubmit because the above CI madness is making things confusing.

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1850
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~raof/mir/privatise-all-the-things/+merge/232664/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2546/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1522/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1499/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1068/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/436/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2546/rebuild

review: Needs Fixing (continuous-integration)

[lp:~raof/mir/privatise-all-the-things]

1851. By Chris Halse Rogers on 2014-08-29

Remerge prerequisite

1852. By Chris Halse Rogers on 2014-08-29

♪ Merge merge merge your prereq gently down the stream ♫

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1851
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~raof/mir/privatise-all-the-things/+merge/232664/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2550/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1522/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1072
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1072/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/442
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2584
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12338

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2550/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1852
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~raof/mir/privatise-all-the-things/+merge/232664/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2553/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1526/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1532
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1075
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1075/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/446
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/446/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2587
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12349

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2553/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

As always, I have no idea what's going wrong in CI; it works fine locally in an i386 chroot...

Maybe pressing the rebuild button will work this time??

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1852
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2591/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1577/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1583/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1559/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1113/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/496/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2591/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Mark as WIP until the prerequisites land.

[lp:~raof/mir/privatise-all-the-things]

1853. By Chris Halse Rogers on 2014-09-03

Stub client library doesn't need to link to mir-test-framework

Fixes failure to build on i386-android-cross-compile

1854. By Chris Halse Rogers on 2014-09-04

Merge versioned-shared-library work

1855. By Chris Halse Rogers on 2014-09-04

Make ProbingClientFactory ignore non-client-platform modules.

You shouldn't be installing non-client platform modules in the client platform path,
but that's no reason not to be robust against it

1856. By Chris Halse Rogers on 2014-09-04

Remove some detritus

1857. By Chris Halse Rogers on 2014-09-04

Define CLIENT_PLATFORM_API instead of the client module path

1858. By Chris Halse Rogers on 2014-09-04

Also make module_for_device ignore non-server-platform modules.

Again, there's no reason not to be robust against this

1859. By Chris Halse Rogers on 2014-09-05

Load the specific platform version we're expecting.

There's no particular reason not to do this now, and it's a bit of safety for when we
*do* have a different platform ABI

1860. By Chris Halse Rogers on 2014-09-10

Merge prereq

1861. By Chris Halse Rogers on 2014-09-11

Merge prereq

1862. By Chris Halse Rogers on 2014-09-11

Merged versioned-loader into private-library-loading.

1863. By Chris Halse Rogers on 2014-09-12

Merged versioned-loader into private-library-loading.

1864. By Chris Halse Rogers on 2014-09-12

Use a dummy library rather than something that might actually have side-effects

1865. By Chris Halse Rogers on 2014-09-18

Merged versioned-loader into private-library-loading.

1866. By Chris Halse Rogers on 2014-09-19

Timeouts for everyone!

This was reliably timing out for me under valgrind. 50 seconds should be enough for everyone!

1867. By Chris Halse Rogers on 2014-09-19

Merge trunk. Conflicts!

1868. By Chris Halse Rogers on 2014-09-19

Fix cross-building of client-platform-dummy

1869. By Chris Halse Rogers on 2014-09-19

Aww, yeah. Don't load libmirplatform twice

1870. By Chris Halse Rogers on 2014-09-23

Merge trunk, reverting version-drivers branch as this subsumes it

1871. By Chris Halse Rogers on 2014-09-25

Merge trunk, resolving conflicts

1872. By Chris Halse Rogers on 2014-10-08

Merge trunk

1873. By Chris Halse Rogers on 2014-10-13

Merge trunk

1874. By Chris Halse Rogers on 2014-10-13

Drop numbering from driver packages.

Looking through what's involved in that ABI, we haven't changed anything in there for a while.

We should be able to handle not breaking the driver interface, and when we do we should
be able to invest the effort to handle backwards compatibility.

1875. By Chris Halse Rogers on 2014-10-13

Use MIR_CLIENT_PLATFORM_2.

We load the platform libraries from an entirely new path, so it's not actually
necessary for the purposes of disambiguation, but it's also harmless.

1876. By Chris Halse Rogers on 2014-10-13

Install and load platform libraries in unadorned path.

1877. By Chris Halse Rogers on 2014-10-16

Merge trunk

1878. By Chris Halse Rogers on 2014-10-16

Drop duplicated prefixes from platform libraries

1879. By Chris Halse Rogers on 2014-10-17

Merge trunk

1880. By Chris Halse Rogers on 2014-10-21

Remove resolved hw_get_module question-comment

1881. By Chris Halse Rogers on 2014-10-21

Remove spurious whitespace changes

1882. By Chris Halse Rogers on 2014-10-21

Use BOOST_THROW_EXCEPTION to decorate the exceptions

1883. By Chris Halse Rogers on 2014-10-21

Clarify MIR_GRAPHICS_PLATFORM_1 CMake comment

1884. By Chris Halse Rogers on 2014-10-21

Fix android platform module install

1885. By Chris Halse Rogers on 2014-10-23

Merge trunk

1886. By Chris Halse Rogers on 2014-10-23

Fix android graphics platform linking post-merge

1887. By Chris Halse Rogers on 2014-10-23

Link Mesa platform graphics module against libmirplatform, to pick up symbol versions

1888. By Chris Halse Rogers on 2014-10-23

Move client and server modules into an appropriate directory in the build tree

1889. By Chris Halse Rogers on 2014-10-24

Fix remaining Android module load failure in tests

1890. By Chris Halse Rogers on 2014-10-24

Merge trunk

1891. By Chris Halse Rogers on 2014-10-24

Turn libplatformstub into platform-graphics-dummy.so and fix the tests

1892. By Chris Halse Rogers on 2014-10-25

Add a set of helpers to find the various platform plugins

1893. By Chris Halse Rogers on 2014-10-29

Don't throw exception pointers; just throw the exception.

1894. By Chris Halse Rogers on 2014-10-29

Fix name for platform-graphics-dummy.so

1895. By Chris Halse Rogers on 2014-10-29

Coalesce all hardcoded platform module strings into {client,server}_platform_() calls

1896. By Chris Halse Rogers on 2014-10-29

Rename, and install client & server stub platforms into mir-test-tools

1897. By Chris Halse Rogers on 2014-10-29

Merge trunk, updating the RendererFactory cludge for graphics-stub.so

1898. By Chris Halse Rogers on 2014-10-29

Fix random tab character

1899. By Chris Halse Rogers on 2014-10-29

Fix stub server platform build on armhf

1900. By Chris Halse Rogers on 2014-11-05

Fix unnecessary symbol leakage from server platform modules

1901. By Chris Halse Rogers on 2014-11-06

Merge trunk

Unmerged revisions

1901. By Chris Halse Rogers on 2014-11-06

Merge trunk

1900. By Chris Halse Rogers on 2014-11-05

Fix unnecessary symbol leakage from server platform modules

1899. By Chris Halse Rogers on 2014-10-29

Fix stub server platform build on armhf

1898. By Chris Halse Rogers on 2014-10-29

Fix random tab character

1897. By Chris Halse Rogers on 2014-10-29

Merge trunk, updating the RendererFactory cludge for graphics-stub.so

1896. By Chris Halse Rogers on 2014-10-29

Rename, and install client & server stub platforms into mir-test-tools

1895. By Chris Halse Rogers on 2014-10-29

Coalesce all hardcoded platform module strings into {client,server}_platform_() calls

1894. By Chris Halse Rogers on 2014-10-29

Fix name for platform-graphics-dummy.so

1893. By Chris Halse Rogers on 2014-10-29

Don't throw exception pointers; just throw the exception.

1892. By Chris Halse Rogers on 2014-10-25

Add a set of helpers to find the various platform plugins

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-09 14:04:48 +0000
+++ CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -159,13 +159,15 @@
 include_directories (${EGL_INCLUDE_DIRS})
 include_directories (${GLM_INCLUDE_DIRS})
 
+find_package( PkgConfig )
+
 if (MIR_BUILD_PLATFORM_ANDROID)
   find_package(AndroidProperties REQUIRED)
   find_package(LibHardware REQUIRED)
+  pkg_check_modules( ANDROID_HEADERS REQUIRED android-headers )
 endif()
 
 if (MIR_BUILD_PLATFORM_MESA)
-  find_package( PkgConfig )
   pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
   pkg_check_modules( DRM REQUIRED libdrm )
 endif()

=== modified file 'client-ABI-sha1sums'
--- client-ABI-sha1sums	2014-09-09 14:04:48 +0000
+++ client-ABI-sha1sums	2014-09-10 08:00:52 +0000
@@ -11,5 +11,5 @@
 183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
 fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
 bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h

=== modified file 'common-ABI-sha1sums'
--- common-ABI-sha1sums	2014-09-09 14:04:48 +0000
+++ common-ABI-sha1sums	2014-09-10 08:00:52 +0000
@@ -7,10 +7,12 @@
 42646c2367b9821e3aa71feff6e31cf50526acaa  include/common/mir/geometry/size.h
 e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/common/mir/graphics/native_buffer.h
 be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
+4d80544bf59ef452979b934d664ac592aff58c82  include/common/mir/shared_library_prober.h
+53e4159f2a0b564cb39a7785b4e229f6f7424779  include/common/mir/shared_library_prober_report.h
 6bb8715336020864626cc8355a0d130db6613ff4  include/common/mir/time/clock.h
 9907751d046e4aea81881cf19e5df52c7a6a813e  include/common/mir_toolkit/client_types.h
 183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
 fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
 bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h

=== modified file 'debian/control'
--- debian/control	2014-09-09 11:19:01 +0000
+++ debian/control	2014-09-10 08:00:52 +0000
@@ -52,8 +52,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libmirplatformgraphics-mesa (= ${binary:Version}) |
-           libmirplatformgraphics-android (= ${binary:Version}),
+         mir-platform-graphics-mesa-1 | mir-platform-graphics-android-1,
 Description: Display server for Ubuntu - server library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -74,7 +73,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the underlying hardware platform.
 
-Package: libmirplatformgraphics-mesa
+Package: mir-platform-graphics-mesa-1
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -88,7 +87,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
-Package: libmirplatformgraphics-android
+Package: mir-platform-graphics-android-1
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -158,8 +157,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libmirclientplatform-mesa (= ${binary:Version}) |
-           libmirclientplatform-android (= ${binary:Version}),
+         mir-client-platform-mesa-1 | mir-client-platform-android-1,
 Description: Display server for Ubuntu - client library
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -181,14 +179,13 @@
  .
  Contains header files required to develop against Mir.
 
-Package: libmirclientplatform-mesa
+Package: mir-client-platform-mesa-1
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Replaces: libmirclientplatform
 Description: Display server for Ubuntu - client platform library for Mesa
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -196,14 +193,13 @@
  Contains the shared libraries required for the Mir clients to interact with
  the underlying hardware platform using the Mesa drivers.
 
-Package: libmirclientplatform-android
+Package: mir-client-platform-android-1
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Replaces: libmirclientplatform
 Description: Display server for Ubuntu - client platform library for Android
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.

=== removed file 'debian/create_postinst_prerm_scripts.sh'
--- debian/create_postinst_prerm_scripts.sh	2014-04-15 15:02:05 +0000
+++ debian/create_postinst_prerm_scripts.sh	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-dpkg_alternatives_priority=500
-deb_host_arch=$1
-deb_host_multiarch=$2
-
-mir_platform_types="platformgraphics clientplatform"
-case $deb_host_arch in
-    arm64)
-        mir_platforms="mesa"
-        ;;
-    *)
-        mir_platforms="android mesa"
-        ;;
-esac
-
-create_script()
-{
-    local script=$1
-    local platform_type=$2
-    local platform=$3
-
-    sed -e "s/@DEB_HOST_MULTIARCH@/$deb_host_multiarch/" \
-        -e "s/@MIR_PLATFORM_TYPE@/$platform_type/" \
-        -e "s/@MIR_PLATFORM@/$platform/" \
-        -e "s/@DPKG_ALTERNATIVES_PRIORITY@/$dpkg_alternatives_priority/" \
-        debian/update-alternatives.${script}.in > debian/libmir$platform_type-$platform.${script}
-}
-
-for platform_type in $mir_platform_types;
-do
-    for platform in $mir_platforms;
-    do
-        create_script postinst $platform_type $platform
-        create_script prerm $platform_type $platform
-    done
-done

=== removed file 'debian/install_ld_so_conf.sh'
--- debian/install_ld_so_conf.sh	2014-04-15 15:02:05 +0000
+++ debian/install_ld_so_conf.sh	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-DEB_HOST_ARCH=$1
-DEB_HOST_MULTIARCH=$2
-
-mir_platform_types="platformgraphics clientplatform"
-case $DEB_HOST_ARCH in
-    arm64)
-        mir_platforms="mesa"
-        ;;
-    *)
-        mir_platforms="android mesa"
-        ;;
-esac
-
-for platform_type in $mir_platform_types;
-do
-    for platform in $mir_platforms;
-    do
-        platform_dir="/usr/lib/$DEB_HOST_MULTIARCH/mir/$platform_type/$platform"
-        package_dir="debian/libmir$platform_type-$platform/$platform_dir"
-        echo "$platform_dir" > $package_dir/ld.so.conf
-    done
-done

=== renamed file 'debian/libmirclientplatform-android.install' => 'debian/mir-client-platform-android-1.install'
--- debian/libmirclientplatform-android.install	2014-02-14 08:43:47 +0000
+++ debian/mir-client-platform-android-1.install	2014-09-10 08:00:52 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/clientplatform/android/*
+usr/lib/*/mir/client-platform-1/client-platform-android.so

=== renamed file 'debian/libmirclientplatform-mesa.install' => 'debian/mir-client-platform-mesa-1.install'
--- debian/libmirclientplatform-mesa.install	2014-02-14 08:43:47 +0000
+++ debian/mir-client-platform-mesa-1.install	2014-09-10 08:00:52 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/clientplatform/mesa/*
+usr/lib/*/mir/client-platform-1/client-platform-mesa.so

=== renamed file 'debian/libmirplatformgraphics-android.install' => 'debian/mir-platform-graphics-android-1.install'
--- debian/libmirplatformgraphics-android.install	2014-02-14 08:43:47 +0000
+++ debian/mir-platform-graphics-android-1.install	2014-09-10 08:00:52 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/platformgraphics/android/*
+usr/lib/*/mir/server-platform-1/platform-graphics-android.so

=== renamed file 'debian/libmirplatformgraphics-mesa.install' => 'debian/mir-platform-graphics-mesa-1.install'
--- debian/libmirplatformgraphics-mesa.install	2014-02-14 08:43:47 +0000
+++ debian/mir-platform-graphics-mesa-1.install	2014-09-10 08:00:52 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/platformgraphics/mesa/*
+usr/lib/*/mir/server-platform-1/platform-graphics-mesa.so

=== modified file 'debian/rules'
--- debian/rules	2014-09-08 04:12:17 +0000
+++ debian/rules	2014-09-10 08:00:52 +0000
@@ -46,14 +46,3 @@
 # TODO: we'll use a symbol file once mir is abi stable
 override_dh_makeshlibs:
 	dh_makeshlibs -V
-
-override_dh_install:
-	dh_install --fail-missing \
-	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirplatformgraphics.so \
-	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirclientplatform.so
-	sh debian/install_ld_so_conf.sh $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH)
-
-override_dh_installdeb:
-	sh debian/create_postinst_prerm_scripts.sh \
-	  $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH)
-	dh_installdeb

=== removed file 'debian/update-alternatives.postinst.in'
--- debian/update-alternatives.postinst.in	2014-02-14 09:20:28 +0000
+++ debian/update-alternatives.postinst.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ];
-then
-    update-alternatives --force --install \
-        /etc/ld.so.conf.d/@DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@.conf \
-        @DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@_conf \
-        /usr/lib/@DEB_HOST_MULTIARCH@/mir/@MIR_PLATFORM_TYPE@/@MIR_PLATFORM@/ld.so.conf \
-        @DPKG_ALTERNATIVES_PRIORITY@
-
-    LDCONFIG_NOTRIGGER=y ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/update-alternatives.prerm.in'
--- debian/update-alternatives.prerm.in	2014-02-14 09:20:28 +0000
+++ debian/update-alternatives.prerm.in	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ];
-then
-    update-alternatives --remove \
-        @DEB_HOST_MULTIARCH@_mir@MIR_PLATFORM_TYPE@_conf \
-        /usr/lib/@DEB_HOST_MULTIARCH@/mir/@MIR_PLATFORM_TYPE@/@MIR_PLATFORM@/ld.so.conf
-
-    ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0

=== modified file 'include.private/common/mir/shared_library.h'
--- include.private/common/mir/shared_library.h	2014-09-08 04:12:17 +0000
+++ include.private/common/mir/shared_library.h	2014-09-10 08:00:52 +0000
@@ -43,9 +43,18 @@
     {
         return load_function<FunctionPtr>(function_name.c_str());
     }
+
+    template<typename FunctionPtr>
+    FunctionPtr load_function(std::string const& function_name, std::string const& version) const
+    {
+        FunctionPtr result{};
+        (void*&)result = load_symbol(function_name.c_str(), version.c_str());
+        return result;
+    }
 private:
     void* const so;
     void* load_symbol(char const* function_name) const;
+    void* load_symbol(char const* function_name, char const* version) const;
     SharedLibrary(SharedLibrary const&) = delete;
     SharedLibrary& operator=(SharedLibrary const&) = delete;
 };

=== modified file 'include.private/platform/mir/graphics/platform.h'
--- include.private/platform/mir/graphics/platform.h	2014-09-09 14:04:48 +0000
+++ include.private/platform/mir/graphics/platform.h	2014-09-10 08:00:52 +0000
@@ -126,6 +126,33 @@
 };
 
 /**
+ * A measure of how good this module is at supporting the current device
+ *
+ * \note This is compared as an integer; best + 1 is a valid PlatformPriority that
+ *       will be used in preference to a module that reports best.
+ *       Platform modules distributed with Mir will never use a priority higher
+ *       than best.
+ */
+enum PlatformPriority : uint32_t
+{
+    unsupported = 0,    /**< Unable to function at all on this device */
+    supported = 128,    /**< Capable of providing a functioning Platform on this device,
+                         *   possibly with degraded performance or features.
+                         */
+    best = 256          /**< Capable of providing a Platform with the best features and
+                         *   performance this device is capable of.
+                         */
+};
+
+/**
+ * Describes a platform module
+ */
+struct ModuleProperties
+{
+    char const* name;
+};
+
+/**
  * Function prototype used to return a new graphics platform.
  *
  * \param [in] options options to use for this platform
@@ -148,6 +175,15 @@
     boost::program_options::options_description& config);
 extern "C" void add_platform_options(
     boost::program_options::options_description& config);
+
+// TODO: We actually need to be more granular here; on a device with more
+//       than one graphics system we may need a different platform per GPU,
+//       so we should be associating platforms with graphics devices in some way
+extern "C" typedef PlatformPriority(*PlatformProbe)();
+extern "C" PlatformPriority probe_platform();
+
+extern "C" typedef ModuleProperties const*(*DescribeModule)();
+extern "C" ModuleProperties const* describe_module();
 }
 }
 

=== removed file 'include.private/platform/mir/shared_library_loader.h'
--- include.private/platform/mir/shared_library_loader.h	2014-09-08 04:12:17 +0000
+++ include.private/platform/mir/shared_library_loader.h	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_SHARED_LIBRARY_LOADER_H_
-#define MIR_SHARED_LIBRARY_LOADER_H_
-
-#include <string>
-namespace mir
-{
-class SharedLibrary;
-SharedLibrary const* load_library(std::string const& libname);
-}
-#endif

=== modified file 'include/common/mir_toolkit/mesa/native_display.h'
--- include/common/mir_toolkit/mesa/native_display.h	2013-08-28 03:41:48 +0000
+++ include/common/mir_toolkit/mesa/native_display.h	2014-09-10 08:00:52 +0000
@@ -39,7 +39,7 @@
 struct MirMesaEGLNativeDisplay
 {
     int (*display_get_platform)(MirMesaEGLNativeDisplay* display,
-                                 MirPlatformPackage* package);
+                                MirPlatformPackage* package);
     void *context;
 };
 
@@ -47,9 +47,9 @@
 {
     int (*surface_set_swapinterval)(MirMesaEGLNativeSurface* surface, int interval);
     int (*surface_advance_buffer)(MirMesaEGLNativeSurface* surface,
-                                   MirBufferPackage* buffer_package);
+                                  MirBufferPackage* buffer_package);
     int (*surface_get_parameters)(MirMesaEGLNativeSurface* surface,
-                                   MirSurfaceParameters* surface_parameters);
+                                  MirSurfaceParameters* surface_parameters);
 };
 
 typedef int (*MirMesaEGLNativeDisplayIsValidFunc)(MirMesaEGLNativeDisplay* display);

=== modified file 'include/platform/mir/options/configuration.h'
--- include/platform/mir/options/configuration.h	2014-09-08 04:12:17 +0000
+++ include/platform/mir/options/configuration.h	2014-09-10 08:00:52 +0000
@@ -39,6 +39,7 @@
 extern char const* const connector_report_opt;
 extern char const* const scene_report_opt;
 extern char const* const input_report_opt;
+extern char const* const shared_library_prober_report_opt;
 extern char const* const host_socket_opt;
 extern char const* const frontend_threads_opt;
 extern char const* const fatal_abort_opt;
@@ -56,6 +57,7 @@
 extern char const* const lttng_opt_value;
 
 extern char const* const platform_graphics_lib;
+extern char const* const platform_graphics_path;
 
 class Configuration
 {

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-09-08 04:12:17 +0000
+++ include/server/mir/default_server_configuration.h	2014-09-10 08:00:52 +0000
@@ -35,6 +35,7 @@
 namespace mir
 {
 class ServerActionQueue;
+class SharedLibraryProberReport;
 
 namespace compositor
 {
@@ -307,6 +308,7 @@
 
     virtual std::shared_ptr<time::Clock> the_clock();
     virtual std::shared_ptr<ServerActionQueue> the_server_action_queue();
+    virtual std::shared_ptr<SharedLibraryProberReport> the_shared_library_prober_report();
 
 protected:
     std::shared_ptr<options::Option> the_options() const;
@@ -407,6 +409,7 @@
     CachedPtr<scene::SessionCoordinator> session_coordinator;
     CachedPtr<EmergencyCleanup> emergency_cleanup;
     CachedPtr<shell::HostLifecycleEventListener> host_lifecycle_event_listener;
+    CachedPtr<SharedLibraryProberReport> shared_library_prober_report;
 
 private:
     std::shared_ptr<options::Configuration> const configuration_options;

=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums	2014-09-09 14:04:48 +0000
+++ platform-ABI-sha1sums	2014-09-10 08:00:52 +0000
@@ -7,12 +7,14 @@
 42646c2367b9821e3aa71feff6e31cf50526acaa  include/common/mir/geometry/size.h
 e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/common/mir/graphics/native_buffer.h
 be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
+4d80544bf59ef452979b934d664ac592aff58c82  include/common/mir/shared_library_prober.h
+53e4159f2a0b564cb39a7785b4e229f6f7424779  include/common/mir/shared_library_prober_report.h
 6bb8715336020864626cc8355a0d130db6613ff4  include/common/mir/time/clock.h
 9907751d046e4aea81881cf19e5df52c7a6a813e  include/common/mir_toolkit/client_types.h
 183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
 fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
 bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 871e609c0fed0d566ddbaaa8ac2d7cd5c06dd09a  include/platform/mir/abnormal_exit.h
 54328767ca330ba166160a486bd0688406ab0222  include/platform/mir/graphics/buffer.h
@@ -25,7 +27,7 @@
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
 15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
-b0014e8c4f44f831c9d178f995efb172417aaee4  include/platform/mir/options/configuration.h
+df61c1168b1798c628d087fc17900d58d608a6fa  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h

=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-09-09 14:04:48 +0000
+++ server-ABI-sha1sums	2014-09-10 08:00:52 +0000
@@ -7,12 +7,14 @@
 42646c2367b9821e3aa71feff6e31cf50526acaa  include/common/mir/geometry/size.h
 e1be9faee8b844ca2ce617f8fd82c9ee08d56bed  include/common/mir/graphics/native_buffer.h
 be7d58c9fde2ce91cc66dd6144b76e08b536266b  include/common/mir/int_wrapper.h
+4d80544bf59ef452979b934d664ac592aff58c82  include/common/mir/shared_library_prober.h
+53e4159f2a0b564cb39a7785b4e229f6f7424779  include/common/mir/shared_library_prober_report.h
 6bb8715336020864626cc8355a0d130db6613ff4  include/common/mir/time/clock.h
 9907751d046e4aea81881cf19e5df52c7a6a813e  include/common/mir_toolkit/client_types.h
 183d9e5e6cfe48b3d9145a28541dd4202ff6137b  include/common/mir_toolkit/common.h
 fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c  include/common/mir_toolkit/cursors.h
 bdaceadd56e41d2cb708f7c4da97acf84dfc75b7  include/common/mir_toolkit/event.h
-99ef5f3bf548508fae24c60f74be1dea018a6e8c  include/common/mir_toolkit/mesa/native_display.h
+4975998aa1056ed0d39dcc538127453e516ad8e9  include/common/mir_toolkit/mesa/native_display.h
 101017c17714a57db57d79b7b5e7df40a3568236  include/common/mir_toolkit/mir_native_buffer.h
 871e609c0fed0d566ddbaaa8ac2d7cd5c06dd09a  include/platform/mir/abnormal_exit.h
 54328767ca330ba166160a486bd0688406ab0222  include/platform/mir/graphics/buffer.h
@@ -25,12 +27,12 @@
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
 15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
-b0014e8c4f44f831c9d178f995efb172417aaee4  include/platform/mir/options/configuration.h
+df61c1168b1798c628d087fc17900d58d608a6fa  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
 f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
-f102d38fd8afd63b636d76005f9b80f3adda0858  include/server/mir/default_server_configuration.h
+d69ff1401221ffa9adce7f8d85074a6f8b234baf  include/server/mir/default_server_configuration.h
 af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
 65db331f1c0e956eced5c9fc73a2b2122dbc8dc7  include/server/mir/frontend/connection_creator.h
 e6e92642301fc9bb85e1d38087a5dd84e5d30fd7  include/server/mir/frontend/connections.h

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/client/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -17,6 +17,17 @@
   ${DRM_INCLUDE_DIRS}
 )
 
+set(MIRCLIENT_ABI 8)
+set(CLIENT_PLATFORM_VERSION "MIR_CLIENTPLATFORM_1")
+set(symbol_map ${CMAKE_SOURCE_DIR}/src/client/symbols.map)
+
+set(MIR_CLIENT_PLATFORM_PATH
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/client-platform-1
+)
+
+add_definitions(-DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}/")
+add_definitions(-DCLIENT_PLATFORM_VERSION="${CLIENT_PLATFORM_VERSION}")
+
 add_subdirectory(rpc/)
 add_subdirectory(lttng/)
 
@@ -55,6 +66,7 @@
   mir_prompt_session.cpp
   mir_prompt_session_api.cpp
   mir_event_distributor.cpp
+  probing_client_platform_factory.cpp
 )
 
 add_library(
@@ -63,9 +75,6 @@
   $<TARGET_OBJECTS:mirclientobjects>
 )
 
-set(MIRCLIENT_ABI 8)
-set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
-
 set_target_properties(
   mirclient
 
@@ -74,8 +83,9 @@
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 
-set(
-  MIR_CLIENT_LIBRARIES
+target_link_libraries(
+  mirclient
+
   mirclientrpc
   mirclientlttngstatic
   mircommon
@@ -85,12 +95,6 @@
   ${XKBCOMMON_LIBRARIES}
 )
 
-target_link_libraries(
-  mirclient
-
-  ${MIR_CLIENT_LIBRARIES}
-)
-
 install(
   TARGETS mirclient
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

=== modified file 'src/client/android/CMakeLists.txt'
--- src/client/android/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/client/android/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -15,17 +15,17 @@
 )
 
 add_library(
-  mirclientplatformandroid SHARED
-  
+  mirclientplatformandroid MODULE
+
   $<TARGET_OBJECTS:mirclientplatformandroidobjects>
   $<TARGET_OBJECTS:mirclient_platformimpl>
 )
 
 set_target_properties(
   mirclientplatformandroid PROPERTIES
-  OUTPUT_NAME mirclientplatform
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+  OUTPUT_NAME client-platform-android
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 
 target_link_libraries(
@@ -35,20 +35,4 @@
   ${LIBHARDWARE_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)
-
-if (MIR_TEST_PLATFORM STREQUAL "android")
-  add_custom_command(TARGET mirclientplatformandroid
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so
-    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/clientplatform/android/libmirclientplatform.so
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
+install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})

=== modified file 'src/client/android/android_native_display_container.cpp'
--- src/client/android/android_native_display_container.cpp	2014-09-08 04:12:17 +0000
+++ src/client/android/android_native_display_container.cpp	2014-09-10 08:00:52 +0000
@@ -62,16 +62,28 @@
 bool
 mcla::AndroidNativeDisplayContainer::validate(MirEGLNativeDisplayType display) const
 {
-    return mir_connection_is_valid(static_cast<MirConnection*>(display));
+    std::lock_guard<std::mutex> lg(guard);
+    return (valid_displays.find(display) != valid_displays.end());
 }
 
 MirEGLNativeDisplayType
-mcla::AndroidNativeDisplayContainer::create(MirConnection* connection)
+mcla::AndroidNativeDisplayContainer::create(ClientContext* context)
 {
-    return static_cast<MirEGLNativeDisplayType>(connection);
+    std::lock_guard<std::mutex> lg(guard);
+    auto egl_display = static_cast<MirEGLNativeDisplayType>(context);
+    valid_displays.insert(egl_display);
+
+    return egl_display;
 }
 
 void
-mcla::AndroidNativeDisplayContainer::release(MirEGLNativeDisplayType /* display */)
+mcla::AndroidNativeDisplayContainer::release(MirEGLNativeDisplayType display)
 {
+    std::lock_guard<std::mutex> lg(guard);
+
+    auto it = valid_displays.find(display);
+    if (it == valid_displays.end())
+        return;
+
+    valid_displays.erase(it);
 }

=== modified file 'src/client/android/android_native_display_container.h'
--- src/client/android/android_native_display_container.h	2013-05-02 00:11:18 +0000
+++ src/client/android/android_native_display_container.h	2014-09-10 08:00:52 +0000
@@ -23,6 +23,9 @@
 
 #include "mir_toolkit/client_types.h"
 
+#include <unordered_set>
+#include <mutex>
+
 namespace mir
 {
 namespace client
@@ -36,7 +39,7 @@
     AndroidNativeDisplayContainer();
     virtual ~AndroidNativeDisplayContainer();
 
-    MirEGLNativeDisplayType create(MirConnection* connection);
+    MirEGLNativeDisplayType create(ClientContext* context) override;
     void release(MirEGLNativeDisplayType display);
 
     bool validate(MirEGLNativeDisplayType display) const;
@@ -44,6 +47,10 @@
 protected:
     AndroidNativeDisplayContainer(AndroidNativeDisplayContainer const&) = delete;
     AndroidNativeDisplayContainer& operator=(AndroidNativeDisplayContainer const&) = delete;
+
+private:
+    std::mutex mutable guard;
+    std::unordered_set<MirEGLNativeDisplayType> valid_displays;
 };
 
 }

=== modified file 'src/client/android/client_platform_factory.cpp'
--- src/client/android/client_platform_factory.cpp	2014-02-07 15:43:41 +0000
+++ src/client/android/client_platform_factory.cpp	2014-09-10 08:00:52 +0000
@@ -16,19 +16,35 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "client_platform_factory.h"
+#include "../client_platform_factory.h"
+#include "mir_toolkit/client_types.h"
+#include "../client_context.h"
 #include "android_client_platform.h"
 
+#include <stdexcept>
+
 namespace mcl = mir::client;
 namespace mcla = mcl::android;
 
-std::shared_ptr<mcl::ClientPlatform>
-mcla::ClientPlatformFactory::create_client_platform(mcl::ClientContext* /*context*/)
+extern "C" std::shared_ptr<mcl::ClientPlatform>
+mcl::create_client_platform(mcl::ClientContext* context)
 {
+    MirPlatformPackage platform;
+    context->populate(platform);
+    if (platform.data_items != 0 || platform.fd_items != 0)
+    {
+        throw new std::runtime_error{"Attempted to create Android client platform on non-Android server"};
+    }
     return std::make_shared<mcla::AndroidClientPlatform>();
 }
 
-extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory()
+extern "C" bool
+mcl::is_appropriate_module(mcl::ClientContext* context)
 {
-    return std::make_shared<mcla::ClientPlatformFactory>();
+    MirPlatformPackage platform;
+    context->populate(platform);
+    // TODO: Actually check what platform we're using, rather than blindly
+    //       hope we can distinguish them from the stuff they've put in the
+    //       PlatformPackage.
+    return platform.data_items == 0 && platform.fd_items == 0;
 }

=== modified file 'src/client/android/client_platform_factory.h'
--- src/client/android/client_platform_factory.h	2014-02-07 15:43:41 +0000
+++ src/client/android/client_platform_factory.h	2014-09-10 08:00:52 +0000
@@ -28,11 +28,8 @@
 namespace android
 {
 
-class ClientPlatformFactory : public client::ClientPlatformFactory
-{
-public:
-    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
-};
+extern "C" std::shared_ptr<ClientPlatform>
+create_client_platform(ClientContext* context);
 
 }
 }

=== modified file 'src/client/android/symbols.map'
--- src/client/android/symbols.map	2014-09-08 04:12:17 +0000
+++ src/client/android/symbols.map	2014-09-10 08:00:52 +0000
@@ -1,5 +1,6 @@
 MIR_CLIENTPLATFORM_1 {
   global: 
-    create_client_platform_factory;
+    create_client_platform;
+    is_appropriate_module;
   local: *;
 };
\ No newline at end of file

=== modified file 'src/client/client_platform_factory.h'
--- src/client/client_platform_factory.h	2014-03-06 06:05:17 +0000
+++ src/client/client_platform_factory.h	2014-09-10 08:00:52 +0000
@@ -41,8 +41,11 @@
     ClientPlatformFactory& operator=(ClientPlatformFactory const& p) = delete;
 };
 
-extern "C" typedef std::shared_ptr<ClientPlatformFactory>(*CreateClientPlatformFactory)();
-extern "C" std::shared_ptr<ClientPlatformFactory> create_client_platform_factory();
+extern "C" typedef std::shared_ptr<ClientPlatform>(*CreateClientPlatform)(ClientContext* context);
+extern "C" std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context);
+
+extern "C" typedef bool (*ClientPlatformProbe)(ClientContext* context);
+extern "C" bool is_appropriate_module(ClientContext* context);
 
 }
 }

=== modified file 'src/client/connection_configuration.h'
--- src/client/connection_configuration.h	2014-09-08 04:12:17 +0000
+++ src/client/connection_configuration.h	2014-09-10 08:00:52 +0000
@@ -39,8 +39,6 @@
 class Logger;
 }
 
-class SharedLibrary;
-
 namespace client
 {
 class ConnectionSurfaceMap;
@@ -65,7 +63,6 @@
     virtual std::shared_ptr<LifecycleControl> the_lifecycle_control() = 0;
     virtual std::shared_ptr<EventSink> the_event_sink() = 0;
     virtual std::shared_ptr<EventHandlerRegister> the_event_handler_register() = 0;
-    virtual std::shared_ptr<SharedLibrary> the_platform_library() = 0;
 
 protected:
     ConnectionConfiguration() = default;

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2014-09-09 09:54:19 +0000
+++ src/client/default_connection_configuration.cpp	2014-09-10 08:00:52 +0000
@@ -35,6 +35,7 @@
 #include "lifecycle_control.h"
 #include "mir/shared_library.h"
 #include "client_platform_factory.h"
+#include "probing_client_platform_factory.h"
 #include "mir_event_distributor.h"
 #include "mir/shared_library_prober.h"
 
@@ -47,7 +48,10 @@
 std::string const off_opt_val{"off"};
 std::string const log_opt_val{"log"};
 std::string const lttng_opt_val{"lttng"};
-std::string const default_platform_lib{"libmirclientplatform.so"};
+
+// Shove this here until we properly manage the lifetime of our
+// loadable modules
+std::shared_ptr<mcl::ProbingClientPlatformFactory> the_platform_prober;
 
 // Hack around the way Qt loads mir:
 // qtmir and therefore Mir are loaded via dlopen(..., RTLD_LOCAL).
@@ -108,11 +112,23 @@
     return client_platform_factory(
         [this]
         {
-            auto const create_client_platform_factory =
-                the_platform_library()->load_function<mcl::CreateClientPlatformFactory>(
-                    "create_client_platform_factory");
-
-            return create_client_platform_factory();
+	    ensure_loaded_with_rtld_global();
+            auto const platform_override = getenv("MIR_CLIENT_PLATFORM_LIB");
+            std::vector<std::shared_ptr<mir::SharedLibrary>> platform_plugins;
+            if (platform_override)
+            {
+                platform_plugins.push_back(std::make_shared<mir::SharedLibrary>(platform_override));
+            }
+            else
+            {
+                auto const platform_path_override = getenv("MIR_CLIENT_PLATFORM_PATH");
+                auto const platform_path = platform_path_override ? platform_path_override : MIR_CLIENT_PLATFORM_PATH;
+                platform_plugins = mir::libraries_for_path(platform_path, *the_shared_library_prober_report());
+            }
+
+            the_platform_prober = std::make_shared<mcl::ProbingClientPlatformFactory>(platform_plugins);
+
+            return the_platform_prober;
         });
 }
 
@@ -211,6 +227,7 @@
         {
             auto val_raw = getenv("MIR_CLIENT_SHARED_LIBRARY_PROBER_REPORT");
             std::string const val{val_raw ? val_raw : off_opt_val};
+
             if (val == log_opt_val)
                 return std::make_shared<mir::logging::SharedLibraryProberReport>(the_logger());
             else if (val == lttng_opt_val)
@@ -219,15 +236,3 @@
                 return std::make_shared<mir::logging::NullSharedLibraryProberReport>();
         });
 }
-
-std::shared_ptr<mir::SharedLibrary> mcl::DefaultConnectionConfiguration::the_platform_library()
-{
-    if (!platform_library)
-    {
-        ensure_loaded_with_rtld_global();
-        auto const val_raw = getenv("MIR_CLIENT_PLATFORM_LIB");
-        std::string const libname{val_raw ? val_raw : default_platform_lib};
-        platform_library = std::make_shared<mir::SharedLibrary>(libname);
-    }
-    return platform_library;
-}

=== modified file 'src/client/default_connection_configuration.h'
--- src/client/default_connection_configuration.h	2014-09-09 09:54:19 +0000
+++ src/client/default_connection_configuration.h	2014-09-10 08:00:52 +0000
@@ -60,16 +60,12 @@
     std::shared_ptr<EventSink> the_event_sink();
     std::shared_ptr<EventHandlerRegister> the_event_handler_register();
     std::shared_ptr<mir::SharedLibraryProberReport> the_shared_library_prober_report();
-    std::shared_ptr<SharedLibrary> the_platform_library() override;
 
     virtual std::string the_socket_file();
     virtual std::shared_ptr<rpc::RpcReport> the_rpc_report();
     virtual std::shared_ptr<input::receiver::InputReceiverReport> the_input_receiver_report();
 
 protected:
-    // MUST be first data member so it is destroyed last.
-    std::shared_ptr<mir::SharedLibrary> platform_library;
-
     CachedPtr<google::protobuf::RpcChannel> rpc_channel;
     CachedPtr<mir::logging::Logger> logger;
     CachedPtr<ClientPlatformFactory> client_platform_factory;

=== modified file 'src/client/egl_native_display_container.h'
--- src/client/egl_native_display_container.h	2014-03-06 06:05:17 +0000
+++ src/client/egl_native_display_container.h	2014-09-10 08:00:52 +0000
@@ -26,12 +26,14 @@
 namespace client
 {
 
+class ClientContext;
+
 class EGLNativeDisplayContainer
 {
 public:
     virtual ~EGLNativeDisplayContainer() {}
 
-    virtual MirEGLNativeDisplayType create(MirConnection* connection) = 0;
+    virtual MirEGLNativeDisplayType create(ClientContext* context) = 0;
     virtual void release(MirEGLNativeDisplayType display) = 0;
 
     virtual bool validate(MirEGLNativeDisplayType display) const = 0;

=== modified file 'src/client/mesa/CMakeLists.txt'
--- src/client/mesa/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/client/mesa/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -17,7 +17,7 @@
 )
 
 add_library(
-  mirclientplatformmesa SHARED
+  mirclientplatformmesa MODULE
 
   $<TARGET_OBJECTS:mirclientplatformmesaobjects>
   $<TARGET_OBJECTS:mirclient_platformimpl>
@@ -25,9 +25,9 @@
 
 set_target_properties(
   mirclientplatformmesa PROPERTIES
-  OUTPUT_NAME mirclientplatform
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+  OUTPUT_NAME client-platform-mesa
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 
 target_link_libraries(
@@ -36,21 +36,4 @@
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
-
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
-  add_custom_command(TARGET mirclientplatformmesa
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove libmirclientplatform.so
-    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/clientplatform/mesa/libmirclientplatform.so
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
-
+install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})

=== modified file 'src/client/mesa/client_platform.cpp'
--- src/client/mesa/client_platform.cpp	2014-03-06 06:05:17 +0000
+++ src/client/mesa/client_platform.cpp	2014-09-10 08:00:52 +0000
@@ -95,7 +95,7 @@
 std::shared_ptr<EGLNativeDisplayType> mclm::ClientPlatform::create_egl_native_display()
 {
     MirEGLNativeDisplayType *mir_native_display = new MirEGLNativeDisplayType;
-    *mir_native_display = display_container.create(context->mir_connection());
+    *mir_native_display = display_container.create(context);
     auto egl_native_display = reinterpret_cast<EGLNativeDisplayType*>(mir_native_display);
 
     return std::shared_ptr<EGLNativeDisplayType>(egl_native_display, NativeDisplayDeleter(display_container));

=== modified file 'src/client/mesa/client_platform_factory.cpp'
--- src/client/mesa/client_platform_factory.cpp	2014-02-07 15:43:41 +0000
+++ src/client/mesa/client_platform_factory.cpp	2014-09-10 08:00:52 +0000
@@ -16,13 +16,16 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "client_platform_factory.h"
+#include "../client_platform_factory.h"
 #include "client_platform.h"
+#include "mir_toolkit/client_types.h"
+#include "../client_context.h"
 #include "buffer_file_ops.h"
 #include "../egl_native_display_container.h"
 
 #include <sys/mman.h>
 #include <unistd.h>
+#include <stdexcept>
 
 namespace mcl = mir::client;
 namespace mclm = mcl::mesa;
@@ -57,15 +60,26 @@
 
 }
 
-std::shared_ptr<mcl::ClientPlatform>
-mclm::ClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
+extern "C" std::shared_ptr<mcl::ClientPlatform> mcl::create_client_platform(mcl::ClientContext* context)
 {
+    MirPlatformPackage package;
+    context->populate(package);
+    if (package.data_items != 0 || package.fd_items != 1)
+    {
+        throw std::runtime_error{"Attempted to create Mesa client platform on non-Mesa server"};
+    }
     auto buffer_file_ops = std::make_shared<RealBufferFileOps>();
     return std::make_shared<mclm::ClientPlatform>(
         context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance());
 }
 
-extern "C" std::shared_ptr<mcl::ClientPlatformFactory> mcl::create_client_platform_factory()
+extern "C" bool
+mcl::is_appropriate_module(mcl::ClientContext* context)
 {
-    return std::make_shared<mclm::ClientPlatformFactory>();
+    MirPlatformPackage platform;
+    context->populate(platform);
+    // TODO: Actually check what platform we're using, rather than blindly
+    //       hope we can distinguish them from the stuff they've put in the
+    //       PlatformPackage.
+    return platform.data_items == 0 && platform.fd_items == 1;
 }

=== modified file 'src/client/mesa/client_platform_factory.h'
--- src/client/mesa/client_platform_factory.h	2014-02-07 15:43:41 +0000
+++ src/client/mesa/client_platform_factory.h	2014-09-10 08:00:52 +0000
@@ -28,11 +28,6 @@
 namespace mesa
 {
 
-class ClientPlatformFactory : public client::ClientPlatformFactory
-{
-public:
-    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
-};
 
 }
 }

=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
--- src/client/mesa/mesa_native_display_container.cpp	2014-09-08 04:12:17 +0000
+++ src/client/mesa/mesa_native_display_container.cpp	2014-09-10 08:00:52 +0000
@@ -18,7 +18,7 @@
 
 #include "mesa_native_display_container.h"
 
-#include "mir_toolkit/mir_client_library.h"
+#include "../client_context.h"
 
 #include <cstring>
 #include <unordered_set>
@@ -35,8 +35,8 @@
 static int egl_display_get_platform(MirMesaEGLNativeDisplay* display,
                                     MirPlatformPackage* package)
 {
-    auto connection = static_cast<MirConnection*>(display->context);
-    mir_connection_get_platform(connection, package);
+    auto context = static_cast<mcl::ClientContext*>(display->context);
+    context->populate(*package);
     return MIR_MESA_TRUE;
 }
 
@@ -93,11 +93,11 @@
 }
 
 MirEGLNativeDisplayType
-mclm::MesaNativeDisplayContainer::create(MirConnection* connection)
+mclm::MesaNativeDisplayContainer::create(ClientContext* context)
 {
     MirMesaEGLNativeDisplay* display = new MirMesaEGLNativeDisplay();
     display->display_get_platform = egl_display_get_platform;
-    display->context = connection;
+    display->context = context;
 
     std::lock_guard<std::mutex> lg(guard);
     auto egl_display = static_cast<MirEGLNativeDisplayType>(display);

=== modified file 'src/client/mesa/mesa_native_display_container.h'
--- src/client/mesa/mesa_native_display_container.h	2014-03-06 06:05:17 +0000
+++ src/client/mesa/mesa_native_display_container.h	2014-09-10 08:00:52 +0000
@@ -40,7 +40,7 @@
     MesaNativeDisplayContainer();
     virtual ~MesaNativeDisplayContainer();
 
-    MirEGLNativeDisplayType create(MirConnection* connection);
+    MirEGLNativeDisplayType create(ClientContext* context);
     void release(MirEGLNativeDisplayType display);
 
     bool validate(MirEGLNativeDisplayType display) const;

=== modified file 'src/client/mesa/native_surface.cpp'
--- src/client/mesa/native_surface.cpp	2014-09-08 04:12:17 +0000
+++ src/client/mesa/native_surface.cpp	2014-09-10 08:00:52 +0000
@@ -20,7 +20,6 @@
 #include "../client_buffer.h"
 #include "native_surface.h"
 
-#include <iostream>
 #include <boost/exception/diagnostic_information.hpp> 
 
 namespace mclm=mir::client::mesa;

=== modified file 'src/client/mesa/symbols.map'
--- src/client/mesa/symbols.map	2014-09-08 04:12:17 +0000
+++ src/client/mesa/symbols.map	2014-09-10 08:00:52 +0000
@@ -1,7 +1,9 @@
 MIR_CLIENTPLATFORM_1 {
   global: 
-    create_client_platform_factory;
+    create_client_platform;
+    is_appropriate_module;
     # Needed by our Mesa EGL platform
     mir_client_mesa_egl_native_display_is_valid;
-  local: *;
+  local:
+    *;
 };

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2014-09-08 04:12:17 +0000
+++ src/client/mir_connection.cpp	2014-09-10 08:00:52 +0000
@@ -94,10 +94,10 @@
 MirConnection::MirConnection(
     mir::client::ConnectionConfiguration& conf) :
         deregisterer{this},
-        platform_library{conf.the_platform_library()},
         channel(conf.the_rpc_channel()),
         server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
         logger(conf.the_logger()),
+        connect_done{false},
         client_platform_factory(conf.the_client_platform_factory()),
         input_platform(conf.the_input_platform()),
         display_configuration(conf.the_display_configuration()),
@@ -249,6 +249,9 @@
                 set_error_message("Connect failed");
             }
         }
+
+        connect_done = true;
+
         /*
          * We need to create the client platform after the connection has been
          * established, to ensure that the client platform has access to all
@@ -353,9 +356,9 @@
 
 void MirConnection::populate(MirPlatformPackage& platform_package)
 {
-    std::lock_guard<decltype(mutex)> lock(mutex);
-
-    if (!connect_result.has_error() && connect_result.has_platform())
+    // connect_result is write-once: once it's valid, we don't need to lock
+    // to use it.
+    if (connect_done && !connect_result.has_error() && connect_result.has_platform())
     {
         auto const& platform = connect_result.platform();
 

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2014-09-08 04:12:17 +0000
+++ src/client/mir_connection.h	2014-09-10 08:00:52 +0000
@@ -22,6 +22,7 @@
 #include <memory>
 #include <unordered_set>
 #include <unordered_map>
+#include <atomic>
 
 #include <mutex>
 
@@ -149,8 +150,9 @@
     std::shared_ptr<google::protobuf::RpcChannel> const channel;
     mir::protobuf::DisplayServer::Stub server;
     std::shared_ptr<mir::logging::Logger> const logger;
-    mir::protobuf::Void void_response;
+    mir::protobuf::Void void_response;    
     mir::protobuf::Connection connect_result;
+    std::atomic<bool> connect_done;
     mir::protobuf::Void ignored;
     mir::protobuf::ConnectParameters connect_parameters;
     mir::protobuf::DRMAuthMagicStatus drm_auth_magic_status;

=== added file 'src/client/probing_client_platform_factory.cpp'
--- src/client/probing_client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ src/client/probing_client_platform_factory.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,36 @@
+#include "probing_client_platform_factory.h"
+
+#include <stdexcept>
+
+namespace mcl = mir::client;
+
+mcl::ProbingClientPlatformFactory::ProbingClientPlatformFactory(std::vector<std::shared_ptr<mir::SharedLibrary>> const& modules)
+    : platform_modules{modules}
+{
+    if (modules.empty())
+    {
+        throw std::runtime_error{"Attempted to create a ClientPlatformFactory with no platform modules"};
+    }
+}
+
+std::shared_ptr<mcl::ClientPlatform>
+mcl::ProbingClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
+{
+    for (auto& module : platform_modules)
+    {
+        try
+        {
+            auto probe = module->load_function<mir::client::ClientPlatformProbe>("is_appropriate_module", CLIENT_PLATFORM_VERSION);
+            if (probe(context))
+            {
+                auto factory = module->load_function<mir::client::CreateClientPlatform>("create_client_platform", CLIENT_PLATFORM_VERSION);
+                return factory(context);
+            }
+        }
+        catch(std::runtime_error)
+        {
+            // We were handled a SharedLibrary that's not a client platform module?
+        }
+    }
+    throw std::runtime_error{"No appropriate client platform module found"};
+}

=== added file 'src/client/probing_client_platform_factory.h'
--- src/client/probing_client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ src/client/probing_client_platform_factory.h	2014-09-10 08:00:52 +0000
@@ -0,0 +1,27 @@
+#ifndef MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_
+#define MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_
+
+#include <vector>
+
+#include "client_platform_factory.h"
+#include "mir/shared_library.h"
+
+namespace mir
+{
+namespace client
+{
+class ProbingClientPlatformFactory : public ClientPlatformFactory
+{
+public:
+    ProbingClientPlatformFactory(std::vector<std::shared_ptr<SharedLibrary>> const& modules);
+
+    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext *context) override;
+private:
+    std::vector<std::shared_ptr<SharedLibrary>> platform_modules;
+};
+
+
+}
+}
+
+#endif // MIR_CLIENT_PROBING_CLIENT_PLATFORM_FACTORY_H_

=== modified file 'src/common/graphics/android/mir_native_window.cpp'
--- src/common/graphics/android/mir_native_window.cpp	2014-09-08 04:12:17 +0000
+++ src/common/graphics/android/mir_native_window.cpp	2014-09-10 08:00:52 +0000
@@ -20,7 +20,6 @@
 #include "mir/graphics/android/android_driver_interpreter.h"
 #include "mir/graphics/android/sync_fence.h"
 
-#include <iostream>
 #include <boost/exception/diagnostic_information.hpp> 
 
 namespace mg=mir::graphics;

=== modified file 'src/common/logging/CMakeLists.txt'
--- src/common/logging/CMakeLists.txt	2014-09-09 09:54:19 +0000
+++ src/common/logging/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -18,7 +18,7 @@
   dumb_console_logger.cpp
   input_timestamp.cpp
   shared_library_prober_report.cpp
-)
+)  
 
 list(APPEND MIR_COMMON_SOURCES
   $<TARGET_OBJECTS:mirsharedlogging>

=== modified file 'src/common/sharedlibrary/CMakeLists.txt'
--- src/common/sharedlibrary/CMakeLists.txt	2014-09-09 09:54:19 +0000
+++ src/common/sharedlibrary/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -23,7 +23,10 @@
   $<TARGET_OBJECTS:mirsharedsharedlibrary>
 )
 
-list(APPEND MIR_COMMON_REFERENCES dl)
+list(APPEND MIR_COMMON_REFERENCES
+  dl
+  ${Boost_LIBRARIES}
+)
 
 set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
 set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)

=== modified file 'src/common/sharedlibrary/shared_library.cpp'
--- src/common/sharedlibrary/shared_library.cpp	2014-03-06 06:05:17 +0000
+++ src/common/sharedlibrary/shared_library.cpp	2014-09-10 08:00:52 +0000
@@ -53,3 +53,15 @@
         BOOST_THROW_EXCEPTION(std::runtime_error(dlerror()));
     }
 }
+
+void* mir::SharedLibrary::load_symbol(char const* function_name, char const* version) const
+{
+    if (void* result = dlvsym(so, function_name, version))
+    {
+        return result;
+    }
+    else
+    {
+        BOOST_THROW_EXCEPTION(std::runtime_error(dlerror()));
+    }
+}

=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/platform/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -7,12 +7,23 @@
 
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
-add_library(mirplatformobjects OBJECT
-  shared_library_loader.cpp
-)
+# This needs to change whenever the much smaller ABI between the platform
+# modules and the server changes in an incompatible way.
+set(SERVER_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_1")
+set(SERVER_PLATFORM_VERSION ${SERVER_PLATFORM_VERSION} PARENT_SCOPE)
+
+set(MIR_SERVER_PLATFORM_PLUGIN_PATH
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/server-platform-1
+)
+set(MIR_SERVER_PLATFORM_PLUGIN_PATH
+  ${MIR_SERVER_PLATFORM_PLUGIN_PATH}
+  PARENT_SCOPE
+)
+
+add_definitions(-DMIR_SERVER_PLATFORM_PLUGIN_PATH="${MIR_SERVER_PLATFORM_PLUGIN_PATH}")
+add_definitions(-DSERVER_PLATFORM_VERSION="${SERVER_PLATFORM_VERSION}")
 
 set(MIR_PLATFORM_OBJECTS
-  $<TARGET_OBJECTS:mirplatformobjects>
   $<TARGET_OBJECTS:mirplatformgraphicscommon>
   $<TARGET_OBJECTS:miroptions>
   $<TARGET_OBJECTS:mirfatal>
@@ -31,17 +42,19 @@
 )
 
 target_link_libraries(mirplatform
+
   mircommon
   ${MIR_PLATFORM_REFERENCES}
 )
 
-set_target_properties(mirplatform
+set_target_properties(
+  mirplatform
+
   PROPERTIES
   SOVERSION ${MIRPLATFORM_ABI}
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 
-
 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 add_subdirectory(graphics/)

=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/platform/graphics/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -14,6 +14,7 @@
   gl_program.cpp
   gl_texture.cpp
   tessellation_helpers.cpp
+  platform_probe.cpp
 )
 
 add_library(mirplatformgraphicscommon OBJECT

=== modified file 'src/platform/graphics/android/CMakeLists.txt'
--- src/platform/graphics/android/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/platform/graphics/android/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -8,7 +8,9 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 add_definitions( -DANDROID )
 
-add_library(mirplatformgraphicsandroidobjects OBJECT
+add_library(
+  mirplatformgraphicsandroidobjects OBJECT
+
   android_platform.cpp
   android_buffer_allocator.cpp
   buffer.cpp
@@ -36,17 +38,12 @@
   real_hwc_wrapper.cpp
   hwc_fallback_gl_renderer.cpp
 )
+
 add_library(mirplatformgraphicsandroid SHARED
+
   $<TARGET_OBJECTS:mirplatformgraphicsandroidobjects>
 )
 
-set_target_properties(
-  mirplatformgraphicsandroid PROPERTIES
-  OUTPUT_NAME mirplatformgraphics
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
-)
-
 target_link_libraries(
   mirplatformgraphicsandroid
 
@@ -59,20 +56,13 @@
   ${ANDROID_PROPERTIES_LDFLAGS}
 )
 
-install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/android)
-
-if (MIR_TEST_PLATFORM STREQUAL "android")
-  add_custom_command(TARGET mirplatformgraphicsandroid
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove libmirplatformgraphics.so
-    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> libmirplatformgraphics.so
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/platformgraphics/android/libmirplatformgraphics.so
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
+set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
+
+set_target_properties(
+  mirplatformgraphicsandroid PROPERTIES
+  OUTPUT_NAME platform-graphics-android
+  PREFIX ""
+  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+)
+
+install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PLUGIN_PATH})

=== modified file 'src/platform/graphics/android/android_platform.cpp'
--- src/platform/graphics/android/android_platform.cpp	2014-09-09 12:41:41 +0000
+++ src/platform/graphics/android/android_platform.cpp	2014-09-10 08:00:52 +0000
@@ -187,3 +187,26 @@
          boost::program_options::value<bool>()->default_value(true), //TODO: switch default to false 
          "[platform-specific] Whether to disable overlay optimizations [{on,off}]");
 }
+
+extern "C" mg::PlatformPriority probe_platform()
+{
+    int err;
+    hw_module_t const* hw_module;
+
+    err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &hw_module);
+
+    // TODO: Yo! kdub! Is this totally insane?
+    // It *looks* like the hw_module_t is global, so we don't leak by
+    // not doing anything with it?
+
+    return err < 0 ? mg::PlatformPriority::unsupported : mg::PlatformPriority::best;
+}
+
+mg::ModuleProperties const description = {
+    "android"
+};
+
+extern "C" mg::ModuleProperties const* describe_module()
+{
+    return &description;
+}

=== added file 'src/platform/graphics/android/symbols.map'
--- src/platform/graphics/android/symbols.map	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/android/symbols.map	2014-09-10 08:00:52 +0000
@@ -0,0 +1,8 @@
+MIR_GRAPHICS_PLATFORM_1 {
+  global:
+    add_platform_options;
+    create_platform;
+    create_native_platform;
+    probe_platform;
+    describe_module;
+};

=== modified file 'src/platform/graphics/mesa/CMakeLists.txt'
--- src/platform/graphics/mesa/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/platform/graphics/mesa/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -11,7 +11,9 @@
 string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 add_definitions(-D__GBM__)
 
-add_library(mirplatformgraphicsmesaobjects OBJECT
+add_library(
+  mirplatformgraphicsmesaobjects OBJECT
+
   platform.cpp
   buffer_allocator.cpp
   gbm_buffer.cpp
@@ -35,18 +37,14 @@
   bypass.cpp
 )
 
-add_library(mirplatformgraphicsmesa SHARED
+add_library(
+  mirplatformgraphicsmesa MODULE
+
   $<TARGET_OBJECTS:mirplatformgraphicsmesaobjects>
 )
 
-set_target_properties(
-  mirplatformgraphicsmesa PROPERTIES
-  OUTPUT_NAME mirplatformgraphics
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
-)
-
-target_link_libraries(mirplatformgraphicsmesa
+target_link_libraries(
+  mirplatformgraphicsmesa
 
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
@@ -55,20 +53,13 @@
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )
 
-install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/mesa)
-
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
-  add_custom_command(TARGET mirplatformgraphicsmesa
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove libmirplatformgraphics.so
-    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> libmirplatformgraphics.so
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/platformgraphics/mesa/libmirplatformgraphics.so
-       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-     )"
-  )
-endif()
+set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
+
+set_target_properties(
+  mirplatformgraphicsmesa PROPERTIES
+  OUTPUT_NAME platform-graphics-mesa
+  PREFIX ""
+  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+)
+
+install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PLUGIN_PATH})

=== modified file 'src/platform/graphics/mesa/platform.cpp'
--- src/platform/graphics/mesa/platform.cpp	2014-09-08 04:12:17 +0000
+++ src/platform/graphics/mesa/platform.cpp	2014-09-10 08:00:52 +0000
@@ -28,6 +28,7 @@
 #include "mir/options/option.h"
 #include "mir/graphics/native_buffer.h"
 #include "mir/emergency_cleanup_registry.h"
+#include "mir/udev/wrapper.h"
 
 #include "drm_close_threadsafe.h"
 
@@ -269,3 +270,30 @@
          boost::program_options::value<bool>()->default_value(true),
          "[platform-specific] utilize the bypass optimization for fullscreen surfaces.");
 }
+
+extern "C" mg::PlatformPriority probe_platform()
+{
+    auto udev = std::make_shared<mir::udev::Context>();
+
+    mir::udev::Enumerator drm_devices{udev};
+    drm_devices.match_subsystem("drm");
+    drm_devices.match_sysname("card[0-9]*");
+    drm_devices.scan_devices();
+
+    for(auto& device : drm_devices)
+    {
+        static_cast<void>(device);
+        return mg::PlatformPriority::best;
+    }
+
+    return mg::PlatformPriority::unsupported;
+}
+
+mg::ModuleProperties const description = {
+    "mesa"
+};
+
+extern "C" mg::ModuleProperties const* describe_module()
+{
+    return &description;
+}

=== added file 'src/platform/graphics/mesa/symbols.map'
--- src/platform/graphics/mesa/symbols.map	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/mesa/symbols.map	2014-09-10 08:00:52 +0000
@@ -0,0 +1,8 @@
+MIR_GRAPHICS_PLATFORM_1 {
+  global:
+    add_platform_options;
+    create_platform;
+    create_native_platform;
+    probe_platform;
+    describe_module;
+};

=== added file 'src/platform/graphics/platform_probe.cpp'
--- src/platform/graphics/platform_probe.cpp	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/platform_probe.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir/graphics/platform.h"
+#include "platform_probe.h"
+
+std::shared_ptr<mir::SharedLibrary>
+mir::graphics::module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules)
+{
+    mir::graphics::PlatformPriority best_priority_so_far = mir::graphics::unsupported;
+    std::shared_ptr<mir::SharedLibrary> best_module_so_far;
+    for(auto& module : modules)
+    {
+        try
+        {
+            auto probe = module->load_function<mir::graphics::PlatformProbe>("probe_platform",
+                                                                             SERVER_PLATFORM_VERSION);
+            auto module_priority = probe();
+            if (module_priority > best_priority_so_far)
+            {
+                best_priority_so_far = module_priority;
+                best_module_so_far = module;
+            }
+        }
+        catch (std::runtime_error)
+        {
+            // Tried to probe a SharedLibrary that isn't a platform module?
+        }
+    }
+    if (best_priority_so_far > mir::graphics::unsupported)
+    {
+        return best_module_so_far;
+    }
+    throw std::runtime_error{"Failed to find platform for current system"};
+}

=== added file 'src/platform/graphics/platform_probe.h'
--- src/platform/graphics/platform_probe.h	1970-01-01 00:00:00 +0000
+++ src/platform/graphics/platform_probe.h	2014-09-10 08:00:52 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_PLATFORM_PROBE_H_
+#define MIR_GRAPHICS_PLATFORM_PROBE_H_
+
+#include <vector>
+#include <memory>
+#include "mir/shared_library.h"
+
+namespace mir
+{
+namespace graphics
+{
+class Platform;
+
+std::shared_ptr<SharedLibrary> module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules);
+
+}
+}
+
+#endif // MIR_GRAPHICS_PLATFORM_PROBE_H_

=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2014-09-09 05:49:11 +0000
+++ src/platform/options/default_configuration.cpp	2014-09-10 08:00:52 +0000
@@ -17,11 +17,12 @@
  */
 
 #include "mir/shared_library.h"
-#include "mir/shared_library_loader.h"
 #include "mir/options/default_configuration.h"
 #include "mir/graphics/platform.h"
 #include "mir/default_configuration.h"
 #include "mir/abnormal_exit.h"
+#include "mir/shared_library_prober.h"
+#include "../graphics/platform_probe.h"
 
 #include <dlfcn.h>
 
@@ -39,6 +40,7 @@
 char const* const mo::connector_report_opt        = "connector-report";
 char const* const mo::scene_report_opt            = "scene-report";
 char const* const mo::input_report_opt            = "input-report";
+char const* const mo::shared_library_prober_report_opt = "shared-library-prober-report";
 char const* const mo::host_socket_opt             = "host-socket";
 char const* const mo::frontend_threads_opt        = "ipc-thread-pool";
 char const* const mo::name_opt                    = "name";
@@ -55,6 +57,7 @@
 char const* const mo::lttng_opt_value = "lttng";
 
 char const* const mo::platform_graphics_lib = "platform-graphics-lib";
+char const* const mo::platform_graphics_path = "platform-graphics-path";
 
 namespace
 {
@@ -63,7 +66,8 @@
 int const glog_minloglevel_default     = 0;
 char const* const glog_log_dir_default = "";
 bool const enable_input_default        = true;
-char const* const default_platform_graphics_lib = "libmirplatformgraphics.so";
+
+std::shared_ptr<mir::SharedLibrary> graphics_lib;
 
 // Hack around the way Qt loads mir:
 // platform_api and therefore Mir are loaded via dlopen(..., RTLD_LOCAL).
@@ -120,8 +124,10 @@
             "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]")
         (no_server_socket_opt, "Do not provide a socket filename for client connections")
         (prompt_socket_opt, "Provide a \"..._trusted\" filename for prompt helper connections")
-        (platform_graphics_lib, po::value<std::string>()->default_value(default_platform_graphics_lib),
-            "Library to use for platform graphics support")
+        (platform_graphics_lib, po::value<std::string>(),
+            "Library to use for platform graphics support (default: autodetect)")
+        (platform_graphics_path, po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PLUGIN_PATH),
+            "Library to use for platform graphics support (default: " MIR_SERVER_PLATFORM_PLUGIN_PATH ")")
         (enable_input_opt, po::value<bool>()->default_value(enable_input_default),
             "Enable input.")
         (compositor_report_opt, po::value<std::string>()->default_value(off_opt_value),
@@ -140,6 +146,8 @@
             "How to handle the MessageProcessor report. [{log,lttng,off}]")
         (scene_report_opt, po::value<std::string>()->default_value(off_opt_value),
             "How to handle the scene report. [{log,lttng,off}]")
+        (shared_library_prober_report_opt, po::value<std::string>()->default_value(off_opt_value),
+                "How to handle the shared library prober report. [{log,lttng,off}]")
         (glog,
             "Use google::GLog for logging")
         (glog_stderrthreshold, po::value<int>()->default_value(glog_stderrthreshold_default),
@@ -167,32 +175,74 @@
         add_platform_options();
 }
 
+namespace
+{
+class NullSharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    void probing_path(boost::filesystem::path const& /*path*/) override
+    {
+    }
+    void probing_failed(boost::filesystem::path const& /*path*/, std::exception const& /*error*/) override
+    {
+    }
+    void loading_library(boost::filesystem::path const& /*filename*/) override
+    {
+    }
+    void loading_failed(boost::filesystem::path const& /*filename*/, std::exception const& /*error*/) override
+    {
+    }
+};
+}
+
 void mo::DefaultConfiguration::add_platform_options()
 {
     namespace po = boost::program_options;
     po::options_description program_options;
     program_options.add_options()
         (platform_graphics_lib,
-         po::value<std::string>()->default_value(default_platform_graphics_lib), "");
+         po::value<std::string>(), "");
+    program_options.add_options()
+        (platform_graphics_path,
+         po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PLUGIN_PATH),
+        "");
     mo::ProgramOption options;
     options.parse_arguments(program_options, argc, argv);
 
-    std::string graphics_libname;
+    ensure_loaded_with_rtld_global();
+
+    // TODO: We should just load all the platform plugins we can and present their options.
     auto env_libname = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_LIB");
-    if (!options.is_set(platform_graphics_lib) && env_libname)
-    {
-        graphics_libname = std::string{env_libname};
-    }
-    else
-    {
-        graphics_libname = options.get<std::string>(platform_graphics_lib);
-    }
-
-    ensure_loaded_with_rtld_global();
-
-    auto graphics_lib = load_library(graphics_libname);
-    auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options"));
-    add_platform_options(*this->program_options);
+    auto env_libpath = ::getenv("MIR_SERVER_PLATFORM_GRAPHICS_PATH");
+    try
+    {
+        if (options.is_set(platform_graphics_lib))
+        {
+            graphics_lib = std::make_shared<mir::SharedLibrary>(options.get<std::string>(platform_graphics_lib));
+        }
+        else if (env_libname)
+        {
+            graphics_lib = std::make_shared<mir::SharedLibrary>(std::string{env_libname});
+        }
+        else
+        {
+            auto const plugin_path = env_libpath ? env_libpath : options.get<std::string>(platform_graphics_path);
+            NullSharedLibraryProberReport nuller;
+            auto plugins = mir::libraries_for_path(plugin_path, nuller);
+            graphics_lib = mir::graphics::module_for_device(plugins);
+        }
+
+        auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options"));
+        add_platform_options(*this->program_options);
+    }
+    catch(...)
+    {
+        // We don't actually care at this point if this failed.
+        // Maybe we've been pointed at the wrong place. Maybe this platform doesn't actually
+        // *have* platform-specific options.
+        // Regardless, if we need a platform and can't find one then we'll bail later
+        // in startup with a useful error.
+    }
 }
 
 boost::program_options::options_description_easy_init mo::DefaultConfiguration::add_options()

=== removed file 'src/platform/shared_library_loader.cpp'
--- src/platform/shared_library_loader.cpp	2014-03-20 16:49:52 +0000
+++ src/platform/shared_library_loader.cpp	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Kevin DuBois <[e-mail]>
- */
-
-#include "mir/shared_library_loader.h"
-#include "mir/shared_library.h"
-#include <memory>
-#include <map>
-
-mir::SharedLibrary const* mir::load_library(std::string const& libname)
-{
-    // There's no point in loading twice, and it isn't safe to unload...
-    static std::map<std::string, std::shared_ptr<mir::SharedLibrary>> libraries_cache;
-
-    if (auto& ptr = libraries_cache[libname])
-    {
-        return ptr.get();
-    }
-    else
-    {
-        ptr = std::make_shared<mir::SharedLibrary>(libname);
-        return ptr.get();
-    }
-}

=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map	2014-09-08 04:12:17 +0000
+++ src/platform/symbols.map	2014-09-10 08:00:52 +0000
@@ -155,6 +155,7 @@
     mir::graphics::InternalSurface::pixel_format*;
     mir::graphics::InternalSurface::size*;
     mir::graphics::InternalSurface::swap_buffers*;
+    mir::graphics::module_for_device*;
     mir::graphics::NativePlatform::create_buffer_allocator*;
     mir::graphics::NativePlatform::create_internal_client*;
     mir::graphics::NativePlatform::fill_buffer_package*;
@@ -225,6 +226,7 @@
     mir::options::glog_log_dir*;
     mir::options::glog_minloglevel*;
     mir::options::glog_stderrthreshold*;
+    mir::options::platform_graphics_path*;
     mir::options::host_socket_opt*;
     mir::options::input_report_opt*;
     mir::options::legacy_input_report_opt*;
@@ -252,6 +254,7 @@
     mir::options::scene_report_opt*;
     mir::options::server_socket_opt*;
     mir::options::session_mediator_report_opt*;
+    mir::options::shared_library_prober_report_opt*;
     typeinfo?for?mir::AbnormalExit;
     typeinfo?for?mir::EmergencyCleanupRegistry;
     typeinfo?for?mir::FatalErrorStrategy;

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2014-09-09 14:04:48 +0000
+++ src/server/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -5,6 +5,9 @@
   ${PROJECT_SOURCE_DIR}/include.private/server
 )
 
+add_definitions(-DMIR_SERVER_PLATFORM_PLUGIN_PATH="${MIR_SERVER_PLATFORM_PLUGIN_PATH}")
+add_definitions(-DSERVER_PLATFORM_VERSION="${SERVER_PLATFORM_VERSION}")
+
 add_subdirectory(compositor/)
 add_subdirectory(graphics/)
 add_subdirectory(input/)
@@ -68,8 +71,9 @@
 )
 
 target_link_libraries(mirserver LINK_PUBLIC
+
+  mirclient
   mirplatform
-  mirclient
   mircommon
   3rd_party
   xcursorloader

=== modified file 'src/server/graphics/CMakeLists.txt'
--- src/server/graphics/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/server/graphics/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -1,4 +1,4 @@
-include_directories(${GLESv2_INCLUDE_DIRS})
+include_directories(${GLESv2_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
 
 add_library(
   mirgraphics OBJECT

=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2014-09-08 04:12:17 +0000
+++ src/server/graphics/default_configuration.cpp	2014-09-10 08:00:52 +0000
@@ -28,10 +28,11 @@
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/gl_config.h"
 #include "mir/graphics/cursor.h"
+#include "src/platform/graphics/platform_probe.h"
 #include "program_factory.h"
 
 #include "mir/shared_library.h"
-#include "mir/shared_library_loader.h"
+#include "mir/shared_library_prober.h"
 #include "mir/abnormal_exit.h"
 #include "mir/emergency_cleanup.h"
 
@@ -43,6 +44,12 @@
 
 namespace mg = mir::graphics;
 
+namespace
+{
+// TODO: Temporary, until we actually manage module lifetimes
+static std::shared_ptr<mir::SharedLibrary> platform_library;
+}
+
 std::shared_ptr<mg::BufferInitializer>
 mir::DefaultServerConfiguration::the_buffer_initializer()
 {
@@ -71,14 +78,27 @@
             if (!the_options()->is_set(options::host_socket_opt))
             {
                 // fallback to standalone if host socket is unset
-                auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
-                auto create_platform = graphics_lib->load_function<mg::CreatePlatform>("create_platform");
+                if (the_options()->is_set(options::platform_graphics_lib))
+                {
+                    platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
+                }
+                else
+                {
+                    auto platforms = mir::libraries_for_path(the_options()->get<std::string>(options::platform_graphics_path), *the_shared_library_prober_report());
+                    if (platforms.empty())
+                    {
+                        throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH);
+                    }
+                    platform_library = mir::graphics::module_for_device(platforms);
+                }
+                auto create_platform = platform_library->load_function<mg::CreatePlatform>("create_platform",
+                                                                                           SERVER_PLATFORM_VERSION);
                 return create_platform(the_options(), the_emergency_cleanup(), the_display_report());
             }
 
             return std::make_shared<mir::graphics::nested::NestedPlatform>(
                 the_host_connection(),
-                the_input_dispatcher(),
+                the_input_dispatcher(), 
                 the_display_report(),
                 the_graphics_native_platform());
         });
@@ -89,8 +109,21 @@
     return graphics_native_platform(
         [this]()
         {
-            auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
-            auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform");
+            if (the_options()->is_set(options::platform_graphics_lib))
+            {
+                platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
+            }
+            else
+            {
+                auto platforms = mir::libraries_for_path(the_options()->get<std::string>(options::platform_graphics_path), *the_shared_library_prober_report());
+                if (platforms.empty())
+                {
+                    throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH);
+                }
+                platform_library = mir::graphics::module_for_device(platforms);
+            }
+            auto create_native_platform = platform_library->load_function<mg::CreateNativePlatform>("create_native_platform",
+                                                                                                    SERVER_PLATFORM_VERSION);
 
             return create_native_platform(the_display_report());
         });

=== modified file 'src/server/logging/CMakeLists.txt'
--- src/server/logging/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/server/logging/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -12,4 +12,3 @@
 
   ${LOGGING_SOURCES}
 )
-

=== modified file 'src/server/report/default_server_configuration.cpp'
--- src/server/report/default_server_configuration.cpp	2014-03-06 06:05:17 +0000
+++ src/server/report/default_server_configuration.cpp	2014-09-10 08:00:52 +0000
@@ -117,3 +117,12 @@
             return report_factory(options::scene_report_opt)->create_scene_report();
         });
 }
+
+auto mir::DefaultServerConfiguration::the_shared_library_prober_report() -> std::shared_ptr<SharedLibraryProberReport>
+{
+    return shared_library_prober_report(
+        [this]()->std::shared_ptr<SharedLibraryProberReport>
+        {
+            return report_factory(options::shared_library_prober_report_opt)->create_shared_library_prober_report();
+        });
+}

=== modified file 'src/server/report/logging/CMakeLists.txt'
--- src/server/report/logging/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/server/report/logging/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -18,4 +18,3 @@
 
   ${LOGGING_SOURCES}
 )
-

=== modified file 'src/server/report/logging/logging_report_factory.cpp'
--- src/server/report/logging/logging_report_factory.cpp	2014-02-11 15:18:07 +0000
+++ src/server/report/logging/logging_report_factory.cpp	2014-09-10 08:00:52 +0000
@@ -25,6 +25,7 @@
 #include "scene_report.h"
 #include "session_mediator_report.h"
 #include "input_report.h"
+#include "mir/logging/shared_library_prober_report.h"
 
 #include "mir/default_server_configuration.h"
 
@@ -72,4 +73,7 @@
     return std::make_shared<logging::InputReport>(logger);
 }
 
-
+std::shared_ptr<mir::SharedLibraryProberReport> mr::LoggingReportFactory::create_shared_library_prober_report()
+{
+    return std::make_shared<mir::logging::SharedLibraryProberReport>(logger);
+}

=== modified file 'src/server/report/logging_report_factory.h'
--- src/server/report/logging_report_factory.h	2014-02-11 15:18:07 +0000
+++ src/server/report/logging_report_factory.h	2014-09-10 08:00:52 +0000
@@ -47,6 +47,8 @@
     std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
     std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
     std::shared_ptr<input::InputReport> create_input_report() override;
+    std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
+
 
 private:
     std::shared_ptr<mir::logging::Logger> const logger;

=== modified file 'src/server/report/lttng/CMakeLists.txt'
--- src/server/report/lttng/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/server/report/lttng/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -17,6 +17,7 @@
   session_mediator_report.cpp
   scene_report.cpp
   server_tracepoint_provider.cpp
+  shared_library_prober_report.cpp
 )
 
 add_library(

=== modified file 'src/server/report/lttng/lttng_report_factory.cpp'
--- src/server/report/lttng/lttng_report_factory.cpp	2014-02-11 15:18:07 +0000
+++ src/server/report/lttng/lttng_report_factory.cpp	2014-09-10 08:00:52 +0000
@@ -25,6 +25,7 @@
 #include "message_processor_report.h"
 #include "scene_report.h"
 #include "session_mediator_report.h"
+#include "shared_library_prober_report.h"
 
 std::shared_ptr<mir::compositor::CompositorReport> mir::report::LttngReportFactory::create_compositor_report()
 {
@@ -61,4 +62,8 @@
     return std::make_shared<lttng::InputReport>();
 }
 
+std::shared_ptr<mir::SharedLibraryProberReport> mir::report::LttngReportFactory::create_shared_library_prober_report()
+{
+    return std::make_shared<lttng::SharedLibraryProberReport>();
+}
 

=== added file 'src/server/report/lttng/shared_library_prober_report.cpp'
--- src/server/report/lttng/shared_library_prober_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/report/lttng/shared_library_prober_report.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "shared_library_prober_report.h"
+#include "mir/report/lttng/mir_tracepoint.h"
+
+#define TRACEPOINT_DEFINE
+#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
+#include "shared_library_prober_report_tp.h"
+
+void mir::report::lttng::SharedLibraryProberReport::probing_path(boost::filesystem::path const& path)
+{
+    mir_tracepoint(mir_server_shared_library_prober, probing_path,
+                   path.string().c_str());
+}
+
+void mir::report::lttng::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& path, std::exception const& error)
+{
+    mir_tracepoint(mir_server_shared_library_prober, probing_failed,
+                   path.string().c_str(), error.what());
+}
+
+void mir::report::lttng::SharedLibraryProberReport::loading_library(boost::filesystem::path const& filename)
+{
+    mir_tracepoint(mir_server_shared_library_prober, loading_library,
+                   filename.string().c_str());
+}
+
+void mir::report::lttng::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& filename, std::exception const& error)
+{
+    mir_tracepoint(mir_server_shared_library_prober, loading_failed,
+                   filename.string().c_str(), error.what());
+}

=== added file 'src/server/report/lttng/shared_library_prober_report.h'
--- src/server/report/lttng/shared_library_prober_report.h	1970-01-01 00:00:00 +0000
+++ src/server/report/lttng/shared_library_prober_report.h	2014-09-10 08:00:52 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_
+#define MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_
+
+#include "server_tracepoint_provider.h"
+
+#include "mir/shared_library_prober_report.h"
+
+#include <stdexcept>
+#include <string>
+
+namespace mir
+{
+namespace report
+{
+namespace lttng
+{
+
+class SharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    void probing_path(boost::filesystem::path const& path) override;
+    void probing_failed(boost::filesystem::path const& path, std::exception const& error) override;
+    void loading_library(boost::filesystem::path const& filename) override;
+    void loading_failed(boost::filesystem::path const& filename, std::exception const& error) override;
+
+private:
+    ServerTracepointProvider tp_provider;
+};
+
+}
+}
+}
+
+#endif // MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_H_

=== added file 'src/server/report/lttng/shared_library_prober_report_tp.h'
--- src/server/report/lttng/shared_library_prober_report_tp.h	1970-01-01 00:00:00 +0000
+++ src/server/report/lttng/shared_library_prober_report_tp.h	2014-09-10 08:00:52 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER mir_server_shared_library_prober
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./shared_library_prober_report_tp.h"
+
+#if !defined(MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_
+
+#include <lttng/tracepoint.h>
+#include <stdint.h>
+
+TRACEPOINT_EVENT(
+    mir_server_shared_library_prober,
+    probing_path,
+    TP_ARGS(const char*, path),
+    TP_FIELDS(
+        ctf_string(path, path)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_shared_library_prober,
+    probing_failed,
+    TP_ARGS(const char*, path, const char*, message),
+    TP_FIELDS(
+        ctf_string(path, path)
+        ctf_string(message, message)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_shared_library_prober,
+    loading_library,
+    TP_ARGS(const char*, path),
+    TP_FIELDS(
+        ctf_string(path, path)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_shared_library_prober,
+    loading_failed,
+    TP_ARGS(const char*, path, const char*, message),
+    TP_FIELDS(
+        ctf_string(path, path)
+        ctf_string(message, message)
+    )
+)
+
+#endif /* MIR_REPORT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ */
+
+#include <lttng/tracepoint-event.h>

=== modified file 'src/server/report/lttng_report_factory.h'
--- src/server/report/lttng_report_factory.h	2014-02-11 15:18:07 +0000
+++ src/server/report/lttng_report_factory.h	2014-09-10 08:00:52 +0000
@@ -35,6 +35,7 @@
     std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
     std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
     std::shared_ptr<input::InputReport> create_input_report() override;
+    std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
 };
 }
 }

=== modified file 'src/server/report/null/CMakeLists.txt'
--- src/server/report/null/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ src/server/report/null/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -9,4 +9,5 @@
     null_report_factory.cpp
     scene_report.cpp
     session_mediator_report.cpp
+    shared_library_prober_report.cpp
     )

=== modified file 'src/server/report/null/null_report_factory.cpp'
--- src/server/report/null/null_report_factory.cpp	2014-02-17 22:35:23 +0000
+++ src/server/report/null/null_report_factory.cpp	2014-09-10 08:00:52 +0000
@@ -25,6 +25,7 @@
 #include "display_report.h"
 #include "input_report.h"
 #include "scene_report.h"
+#include "shared_library_prober_report.h"
 
 std::shared_ptr<mir::compositor::CompositorReport> mir::report::NullReportFactory::create_compositor_report()
 {
@@ -61,6 +62,11 @@
     return std::make_shared<null::InputReport>();
 }
 
+std::shared_ptr<mir::SharedLibraryProberReport> mir::report::NullReportFactory::create_shared_library_prober_report()
+{
+    return std::make_shared<null::SharedLibraryProberReport>();
+}
+
 std::shared_ptr<mir::compositor::CompositorReport> mir::report::null_compositor_report()
 {
     return NullReportFactory{}.create_compositor_report();
@@ -90,3 +96,8 @@
 {
     return NullReportFactory{}.create_input_report();
 }
+
+std::shared_ptr<mir::SharedLibraryProberReport> mir::report::null_shared_library_prober_report()
+{
+    return NullReportFactory{}.create_shared_library_prober_report();
+}

=== added file 'src/server/report/null/shared_library_prober_report.cpp'
--- src/server/report/null/shared_library_prober_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/report/null/shared_library_prober_report.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "shared_library_prober_report.h"
+
+void mir::report::null::SharedLibraryProberReport::probing_path(boost::filesystem::path const& /*path*/)
+{
+}
+
+void mir::report::null::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& /*path*/, std::exception const& /*error*/)
+{
+}
+
+void mir::report::null::SharedLibraryProberReport::loading_library(boost::filesystem::path const& /*filename*/)
+{
+}
+
+void mir::report::null::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& /*filename*/, std::exception const& /*error*/)
+{
+}

=== added file 'src/server/report/null/shared_library_prober_report.h'
--- src/server/report/null/shared_library_prober_report.h	1970-01-01 00:00:00 +0000
+++ src/server/report/null/shared_library_prober_report.h	2014-09-10 08:00:52 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_REPORT_NULL_SHARED_LIBRARY_PROBER_REPORT_H_
+#define MIR_REPORT_NULL_SHARED_LIBRARY_PROBER_REPORT_H_
+
+#include "mir/shared_library_prober_report.h"
+
+namespace mir
+{
+namespace report
+{
+namespace null
+{
+class SharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    void probing_path(boost::filesystem::path const& path);
+    void probing_failed(boost::filesystem::path const& path, std::exception const& error);
+    void loading_library(boost::filesystem::path const& filename);
+    void loading_failed(boost::filesystem::path const& filename, std::exception const& error);
+};
+
+}
+}
+}
+
+#endif // MIR_REPORT_NULL_SHARED_LIBRARY_PROBER_REPORT_H_

=== modified file 'src/server/report/null_report_factory.h'
--- src/server/report/null_report_factory.h	2014-02-17 22:35:23 +0000
+++ src/server/report/null_report_factory.h	2014-09-10 08:00:52 +0000
@@ -35,6 +35,7 @@
     std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() override;
     std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
     std::shared_ptr<input::InputReport> create_input_report() override;
+    std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
 };
 
 std::shared_ptr<compositor::CompositorReport> null_compositor_report();
@@ -44,7 +45,7 @@
 std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report();
 std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report();
 std::shared_ptr<input::InputReport> null_input_report();
-
+std::shared_ptr<SharedLibraryProberReport> null_shared_library_prober_report();
 }
 }
 

=== modified file 'src/server/report/report_factory.h'
--- src/server/report/report_factory.h	2014-02-11 15:18:07 +0000
+++ src/server/report/report_factory.h	2014-09-10 08:00:52 +0000
@@ -23,6 +23,8 @@
 
 namespace mir
 {
+
+class SharedLibraryProberReport;
 namespace compositor
 {
 class CompositorReport;
@@ -59,6 +61,7 @@
     virtual std::shared_ptr<frontend::SessionMediatorReport> create_session_mediator_report() = 0;
     virtual std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() = 0;
     virtual std::shared_ptr<input::InputReport> create_input_report() = 0;
+    virtual std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() = 0;
 
 protected:
     ReportFactory() = default;

=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2014-09-09 14:04:48 +0000
+++ src/server/symbols.map	2014-09-10 08:00:52 +0000
@@ -174,6 +174,7 @@
     mir::DefaultServerConfiguration::the_session_event_sink*;
     mir::DefaultServerConfiguration::the_session_listener*;
     mir::DefaultServerConfiguration::the_session_mediator_report*;
+    mir::DefaultServerConfiguration::the_shared_library_prober_report*;
     mir::DefaultServerConfiguration::the_shell_display_layout*;
     mir::DefaultServerConfiguration::the_shell_focus_setter*;
     mir::DefaultServerConfiguration::the_snapshot_strategy*;
@@ -754,6 +755,7 @@
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_event_sink*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_listener*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_session_mediator_report*;
+    non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shared_library_prober_report*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shell_display_layout*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_shell_focus_setter*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_snapshot_strategy*;

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -93,8 +93,10 @@
   "MIR_BUILD_ACCEPTANCE_TESTS"
   OFF)
 
+set (MIR_CLIENT_PLATFORM client-platform-dummy.so)
+
 if (MIR_RUN_ACCEPTANCE_TESTS)
-  mir_discover_tests(mir_acceptance_tests)
+  mir_discover_tests(mir_acceptance_tests MIR_CLIENT_PLATFORM_LIB=${LIBRARY_OUTPUT_PATH}/${MIR_CLIENT_PLATFORM})
 endif (MIR_RUN_ACCEPTANCE_TESTS)
 
 install(

=== modified file 'tests/acceptance-tests/test_symbols_required_by_mesa.cpp'
--- tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-07-30 13:19:36 +0000
+++ tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-09-10 08:00:52 +0000
@@ -23,9 +23,9 @@
 
 using namespace testing;
 
-TEST(SymbolsRequiredByMesa, are_exported_by_libmirclientplatform)
+TEST(SymbolsRequiredByMesa, are_exported_by_client_platform_mesa)
 {
-    auto const handle = dlopen("libmirclientplatform.so", RTLD_LAZY);
+    auto const handle = dlopen("client-platform-mesa.so", RTLD_LAZY);
     ASSERT_THAT(handle, NotNull());
 
     auto const sym = dlsym(handle, "mir_client_mesa_egl_native_display_is_valid");
@@ -36,7 +36,7 @@
 
 TEST(SymbolsRequiredByMesa, are_exported_by_libmirplatformgraphics)
 {
-    auto const handle = dlopen("libmirplatformgraphics.so", RTLD_LAZY);
+    auto const handle = dlopen("platform-graphics-mesa.so", RTLD_LAZY);
     ASSERT_THAT(handle, NotNull());
 
     auto const sym = dlsym(handle, "mir_server_mesa_egl_native_display_is_valid");

=== modified file 'tests/include/mir_test_doubles/mock_android_alloc_device.h'
--- tests/include/mir_test_doubles/mock_android_alloc_device.h	2013-06-18 08:00:49 +0000
+++ tests/include/mir_test_doubles/mock_android_alloc_device.h	2014-09-10 08:00:52 +0000
@@ -19,7 +19,12 @@
 #define MIR_TEST_DOUBLES_MOCK_ANDROID_ALLOC_DEVICE_H_
 
 #include <gmock/gmock.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <hardware/gralloc.h>
+#pragma GCC diagnostic pop
 
 namespace mir
 {

=== modified file 'tests/include/mir_test_doubles/mock_android_hw.h'
--- tests/include/mir_test_doubles/mock_android_hw.h	2013-05-20 15:55:48 +0000
+++ tests/include/mir_test_doubles/mock_android_hw.h	2014-09-10 08:00:52 +0000
@@ -21,7 +21,12 @@
 #include "mir_test_doubles/mock_android_alloc_device.h"
 #include "mir_test_doubles/mock_hwc_composer_device_1.h"
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <hardware/hardware.h>
+#pragma GCC diagnostic pop
+
 #include <gmock/gmock.h>
 #include <memory>
 

=== modified file 'tests/include/mir_test_doubles/mock_hwc_composer_device_1.h'
--- tests/include/mir_test_doubles/mock_hwc_composer_device_1.h	2014-03-26 05:48:59 +0000
+++ tests/include/mir_test_doubles/mock_hwc_composer_device_1.h	2014-09-10 08:00:52 +0000
@@ -19,7 +19,12 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_
 #define MIR_TEST_DOUBLES_MOCK_HWC_COMPOSER_DEVICE_1_H_
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <hardware/hwcomposer.h>
+#pragma GCC diagnostic pop
+
 #include <gmock/gmock.h>
 
 namespace mir

=== added file 'tests/include/mir_test_framework/client_platform_factory.h'
--- tests/include/mir_test_framework/client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_framework/client_platform_factory.h	2014-09-10 08:00:52 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_
+#define MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_
+
+
+#include "mir/shared_library.h"
+#include "src/client/client_platform_factory.h"
+#include "executable_path.h"
+#include "mir_test_doubles/mock_client_context.h"
+
+namespace mtd = mir::test::doubles;
+
+namespace mir_test_framework
+{
+std::shared_ptr<mir::SharedLibrary> platform_library;
+
+std::shared_ptr<mir::client::ClientPlatform> create_android_client_platform()
+{
+    using namespace testing;
+    mtd::MockClientContext ctx;
+    ON_CALL(ctx, populate(_))
+        .WillByDefault(Invoke([](MirPlatformPackage& package) { ::memset(&package, 0, sizeof(package)); }));
+    platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-platform-android.so");
+    auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
+    return platform_factory(&ctx);
+}
+
+std::shared_ptr<mir::client::ClientPlatform> create_mesa_client_platform()
+{
+    using namespace testing;
+    mtd::MockClientContext ctx;
+    ON_CALL(ctx, populate(_))
+        .WillByDefault(Invoke([](MirPlatformPackage& package)
+                              {
+                                  ::memset(&package, 0, sizeof(package));
+                                  package.fd_items = 1;
+                              }));
+    platform_library = std::make_shared<mir::SharedLibrary>(library_path() + "/client-platform-mesa.so");
+    auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
+    return platform_factory(&ctx);
+}
+
+std::shared_ptr<mir::SharedLibrary>
+get_platform_library()
+{
+    if (!platform_library)
+    {
+        throw std::logic_error{"Must call one of create_*_client_platform() before calling get_platform_library()"};
+    }
+    return platform_library;
+}
+
+}
+
+#endif // MIR_TEST_FRAMEWORK_CLIENT_PLATFORM_FACTORY_H_

=== modified file 'tests/include/mir_test_framework/executable_path.h'
--- tests/include/mir_test_framework/executable_path.h	2014-07-29 12:28:04 +0000
+++ tests/include/mir_test_framework/executable_path.h	2014-09-10 08:00:52 +0000
@@ -24,5 +24,7 @@
 namespace mir_test_framework
 {
 std::string executable_path();
+
+std::string library_path();
 }
 #endif /* MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_ */

=== added file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
--- tests/include/mir_test_framework/stub_client_platform_factory.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_framework/stub_client_platform_factory.h	2014-09-10 08:00:52 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
+#define MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
+
+#include "src/client/client_platform_factory.h"
+
+namespace mir_test_framework
+{
+
+struct StubClientPlatformFactory : public mir::client::ClientPlatformFactory
+{
+    std::shared_ptr<mir::client::ClientPlatform> create_client_platform(mir::client::ClientContext* context) override;
+};
+
+}
+#endif /* MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_ */

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -73,6 +73,15 @@
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
   ${GMOCK_MAIN_LIBRARY}
+  # Mesa platform dependencies
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+  # Android platform dependencies
+  ${LIBHARDWARE_LIBRARIES}
+  ${ANDROID_PROPERTIES_LIBRARIES}
+  # Shared platform dependencies
+  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
+  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
   ${GBM_LDFLAGS} ${GBM_LIBRARIES}
@@ -81,7 +90,7 @@
   ${MIR_SERVER_REFERENCES}
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "android")
+if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_integration_tests
   mirsharedandroid
   ${ANDROID_PROPERTIES_LDFLAGS}
@@ -95,8 +104,18 @@
   "MIR_BUILD_INTEGRATION_TESTS"
   OFF)
 
+set (MIR_CLIENT_MODULE "client-platform-dummy.so")
+
+if (MIR_TEST_PLATFORM STREQUAL "android")
+  # Android platform integration tests have Android-specific tests
+  # requiring a real platform
+  set (MIR_CLIENT_MODULE "client-platform-android.so")
+endif()
+
 if (MIR_RUN_INTEGRATION_TESTS)
-  mir_discover_tests(mir_integration_tests)
+  mir_discover_tests(mir_integration_tests
+    MIR_CLIENT_PLATFORM_LIB=${LIBRARY_OUTPUT_PATH}/${MIR_CLIENT_MODULE}
+  )
 endif (MIR_RUN_INTEGRATION_TESTS)
 
 install(

=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -23,16 +23,19 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl.cpp
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
-include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
-list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp
-)
-elseif (MIR_TEST_PLATFORM STREQUAL "android")
-list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp
-)
+if (MIR_BUILD_PLATFORM_MESA)
+  include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
+  list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gbm.cpp
+  )
+endif()
+
+if (MIR_BUILD_PLATFORM_ANDROID)
+  include_directories(${ANDROID_HEADERS_INCLUDE_DIRS})
+  list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp
+  )
 endif()
 
 add_library(

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -3,6 +3,7 @@
     ${GLESv2_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}
     ${UMOCKDEV_INCLUDE_DIRS}
+    ${ANDROID_HEADERS_INCLUDE_DIRS}
 )
 
 set(
@@ -20,6 +21,7 @@
   display_server_test_fixture.cpp
   process.cpp
   using_stub_client_platform.cpp
+  stub_client_platform_factory.cpp
   udev_environment.cpp
   declarative_placement_strategy.cpp
   fake_event_hub_server_configuration.cpp
@@ -55,6 +57,43 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
+set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols-client.map)
+
+add_library(
+  mirclientplatformstub MODULE
+
+  stub_client_platform_module.cpp
+)
+
+target_link_libraries(
+  mirclientplatformstub
+
+  mir-test-framework
+  ${UMOCKDEV_LIBRARIES}
+)
+
+set_target_properties(
+  mirclientplatformstub PROPERTIES;
+  OUTPUT_NAME client-platform-dummy
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
+)
+
+set(server_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols-server.map)
+add_library(
+  mirplatformgraphicsstub MODULE
+
+  platform_graphics_dummy.cpp
+)
+
+set_target_properties(
+  mirplatformgraphicsstub PROPERTIES;
+  OUTPUT_NAME platform-graphics-dummy
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${server_symbol_map}"
+)
+
+
 add_custom_command(TARGET mir-test-framework POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
   ${CMAKE_CURRENT_SOURCE_DIR}/udev_recordings ${CMAKE_BINARY_DIR}/bin/udev_recordings

=== modified file 'tests/mir_test_framework/executable_path.cpp'
--- tests/mir_test_framework/executable_path.cpp	2014-07-29 12:28:04 +0000
+++ tests/mir_test_framework/executable_path.cpp	2014-09-10 08:00:52 +0000
@@ -38,3 +38,8 @@
     buf[tmp] = '\0';
     return dirname(buf);
 }
+
+std::string mir_test_framework::library_path()
+{
+    return executable_path() + "/../lib";
+}

=== added file 'tests/mir_test_framework/platform_graphics_dummy.cpp'
--- tests/mir_test_framework/platform_graphics_dummy.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/platform_graphics_dummy.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>>
+ */
+
+#include "mir/graphics/platform.h"
+
+extern "C" mir::graphics::PlatformPriority probe_platform()
+{
+    return mir::graphics::supported;
+}
+
+mir::graphics::ModuleProperties const description {
+    "dummy"
+};
+
+extern "C" mir::graphics::ModuleProperties const* describe_module()
+{
+    return &description;
+}

=== added file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
--- tests/mir_test_framework/stub_client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/stub_client_platform_factory.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir_test_framework/stub_client_platform_factory.h"
+#include "src/client/client_buffer_factory.h"
+#include "src/client/client_buffer.h"
+#include "src/client/client_platform.h"
+
+#include <string.h>
+
+namespace mcl = mir::client;
+namespace geom = mir::geometry;
+namespace mtf = mir_test_framework;
+
+namespace
+{
+class StubClientBuffer : public mcl::ClientBuffer
+{
+public:
+    StubClientBuffer(std::shared_ptr<MirBufferPackage> const& package)
+    {
+        static_cast<void>(package);
+#ifndef ANDROID
+        native = package;
+#endif
+    }
+
+    std::shared_ptr<mcl::MemoryRegion> secure_for_cpu_write()
+    {
+        return nullptr;
+    }
+
+    geom::Size size() const
+    {
+        return geom::Size{};
+    }
+
+    geom::Stride stride() const
+    {
+        return geom::Stride{};
+    }
+
+    MirPixelFormat pixel_format() const
+    {
+        return mir_pixel_format_abgr_8888;
+    }
+
+    uint32_t age() const
+    {
+        return 0;
+    }
+    void increment_age()
+    {
+    }
+    void mark_as_submitted()
+    {
+    }
+    std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const
+    {
+#ifdef ANDROID
+        return nullptr;
+#else
+        return native;
+#endif
+    }
+    void update_from(MirBufferPackage const& package) override
+    {
+        static_cast<void>(package);
+#ifndef ANDROID
+        ::memcpy(native.get(), &package, sizeof(package));
+#endif
+    }
+private:
+#ifndef ANDROID
+    std::shared_ptr<mir::graphics::NativeBuffer> native;
+#endif
+};
+
+struct StubClientBufferFactory : public mcl::ClientBufferFactory
+{
+    std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
+                                                     geom::Size, MirPixelFormat)
+    {
+        return std::make_shared<StubClientBuffer>(package);
+    }
+};
+
+struct StubClientPlatform : public mcl::ClientPlatform
+{
+    MirPlatformType platform_type() const
+    {
+        return mir_platform_type_gbm;
+    }
+
+    std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory()
+    {
+        return std::make_shared<StubClientBufferFactory>();
+    }
+
+    std::shared_ptr<EGLNativeWindowType> create_egl_native_window(mcl::ClientSurface*)
+    {
+        auto fake_window = reinterpret_cast<EGLNativeWindowType>(0x12345678lu);
+        return std::make_shared<EGLNativeWindowType>(fake_window);
+    }
+
+    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display()
+    {
+        auto fake_display = reinterpret_cast<EGLNativeDisplayType>(0x12345678lu);
+        return std::make_shared<EGLNativeDisplayType>(fake_display);
+    }
+
+    MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer* buf) const
+    {
+        static_cast<void>(buf);
+#ifndef ANDROID
+        return buf;
+#else
+        return nullptr;
+#endif
+    }
+};
+}
+
+std::shared_ptr<mcl::ClientPlatform>
+mtf::StubClientPlatformFactory::create_client_platform(mcl::ClientContext*)
+{
+    return std::make_shared<StubClientPlatform>();
+}

=== added file 'tests/mir_test_framework/stub_client_platform_module.cpp'
--- tests/mir_test_framework/stub_client_platform_module.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/stub_client_platform_module.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>>
+ */
+
+#include "src/client/client_platform_factory.h"
+
+#include "mir_test_framework/stub_client_platform_factory.h"
+#include <memory>
+
+namespace mtf = mir_test_framework;
+namespace mcl = mir::client;
+
+extern "C" std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext* context)
+{
+    return mtf::StubClientPlatformFactory{}.create_client_platform(context);
+}
+
+extern "C" bool is_appropriate_module(mcl::ClientContext* /*context*/)
+{
+    return true;
+}

=== added file 'tests/mir_test_framework/symbols-client.map'
--- tests/mir_test_framework/symbols-client.map	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/symbols-client.map	2014-09-10 08:00:52 +0000
@@ -0,0 +1,7 @@
+MIR_CLIENTPLATFORM_1 {
+  global: 
+    create_client_platform;
+    is_appropriate_module;
+  local:
+    *;
+};

=== added file 'tests/mir_test_framework/symbols-server.map'
--- tests/mir_test_framework/symbols-server.map	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/symbols-server.map	2014-09-10 08:00:52 +0000
@@ -0,0 +1,10 @@
+MIR_GRAPHICS_PLATFORM_1 {
+  global:
+    add_platform_options;
+    create_platform;
+    create_native_platform;
+    probe_platform;
+    describe_module;
+  local:
+    *;
+};

=== modified file 'tests/mir_test_framework/testing_client_options.cpp'
--- tests/mir_test_framework/testing_client_options.cpp	2014-09-08 04:12:17 +0000
+++ tests/mir_test_framework/testing_client_options.cpp	2014-09-10 08:00:52 +0000
@@ -16,112 +16,12 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir_test_framework/testing_client_configuration.h"
 #include "mir_test_framework/stub_client_connection_configuration.h"
-#include "mir/options/program_option.h"
 #include "src/client/default_connection_configuration.h"
-#include "src/client/client_platform_factory.h"
-#include "src/client/client_buffer_factory.h"
-#include "src/client/client_buffer.h"
-#include "src/client/client_platform.h"
-#include "src/client/mir_connection.h"
+#include "mir_test_framework/stub_client_platform_factory.h"
 
 namespace mcl = mir::client;
-namespace mtf=mir_test_framework;
-namespace geom = mir::geometry;
-
-
-namespace
-{
-class StubClientBuffer : public mcl::ClientBuffer
-{
-    std::shared_ptr<mcl::MemoryRegion> secure_for_cpu_write()
-    {
-        return nullptr;
-    }
-
-    geom::Size size() const
-    {
-        return geom::Size{};
-    }
-
-    geom::Stride stride() const
-    {
-        return geom::Stride{};
-    }
-
-    MirPixelFormat pixel_format() const
-    {
-        return mir_pixel_format_abgr_8888;
-    }
-
-    uint32_t age() const
-    {
-        return 0;
-    }
-    void increment_age()
-    {
-    }
-    void mark_as_submitted()
-    {
-    }
-    std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const
-    {
-        return nullptr;
-    }
-    void update_from(MirBufferPackage const&) override
-    {
-    }
-};
-
-struct StubClientBufferFactory : public mcl::ClientBufferFactory
-{
-    std::shared_ptr<mcl::ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const&,
-                                                     geom::Size, MirPixelFormat)
-    {
-        return std::make_shared<StubClientBuffer>();
-    }
-};
-
-struct StubClientPlatform : public mcl::ClientPlatform
-{
-    MirPlatformType platform_type() const
-    {
-        return mir_platform_type_gbm;
-    }
-
-    std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory()
-    {
-        return std::make_shared<StubClientBufferFactory>();
-    }
-
-    std::shared_ptr<EGLNativeWindowType> create_egl_native_window(mcl::ClientSurface*)
-    {
-        auto fake_window = reinterpret_cast<EGLNativeWindowType>(0x12345678lu);
-        return std::make_shared<EGLNativeWindowType>(fake_window);
-    }
-
-    std::shared_ptr<EGLNativeDisplayType> create_egl_native_display()
-    {
-        auto fake_display = reinterpret_cast<EGLNativeDisplayType>(0x12345678lu);
-        return std::make_shared<EGLNativeDisplayType>(fake_display);
-    }
-
-    MirNativeBuffer* convert_native_buffer(mir::graphics::NativeBuffer*) const
-    {
-        return nullptr;
-    }
-};
-
-struct StubClientPlatformFactory : public mcl::ClientPlatformFactory
-{
-    std::shared_ptr<mcl::ClientPlatform> create_client_platform(mcl::ClientContext*)
-    {
-        return std::make_shared<StubClientPlatform>();
-    }
-};
-
-}
+namespace mtf = mir_test_framework;
 
 mtf::StubConnectionConfiguration::StubConnectionConfiguration(std::string const& socket_file)
     : DefaultConnectionConfiguration(socket_file)

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-09-09 11:19:01 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -2,7 +2,23 @@
 
 add_definitions(-DTEST_RECORDINGS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/input_recordings/")
 
-include_directories(${DRM_INCLUDE_DIRS} ${GBM_INCLUDE_DIRS} ${UMOCKDEV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
+if (MIR_BUILD_PLATFORM_ANDROID)
+  add_definitions(-DMIR_BUILD_PLATFORM_ANDROID)
+endif()
+
+if (MIR_BUILD_PLATFORM_MESA)
+  add_definitions(-DMIR_BUILD_PLATFORM_MESA)
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+
+include_directories(
+  ${ANDROID_HEADERS_INCLUDE_DIRS}
+  ${DRM_INCLUDE_DIRS}
+  ${GBM_INCLUDE_DIRS}
+  ${UMOCKDEV_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}
+)
 # TODO: Aim to remove
 include_directories(${MIR_XCURSOR_INCLUDE_DIRECTORIES})
 
@@ -19,6 +35,7 @@
   test_thread_name.cpp
   test_default_emergency_cleanup.cpp
   test_basic_observers.cpp
+  test_shared_library_prober.cpp
   test_fatal.cpp
   test_fd.cpp
   test_shared_library_prober.cpp
@@ -75,6 +92,15 @@
   ${GMOCK_MAIN_LIBRARY}
   ${Boost_LIBRARIES}
   ${UMOCKDEV_LIBRARIES}
+  # Mesa platform dependencies
+  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+  # Android platform dependencies
+  ${LIBHARDWARE_LIBRARIES}
+  ${ANDROID_PROPERTIES_LIBRARIES}
+  # Shared platform dependencies
+  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
+  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
   ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
@@ -83,7 +109,7 @@
   ${MIR_SERVER_REFERENCES}
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "android")
+if (MIR_BUILD_PLATFORM_ANDROID)
 target_link_libraries(mir_unit_tests 
   mirsharedandroid
   ${ANDROID_PROPERTIES_LDFLAGS}
@@ -100,8 +126,14 @@
   "MIR_BUILD_UNIT_TESTS"
   OFF)
 
+set (MIR_CLIENT_PLATFORM client-platform-dummy.so)
+
 if (MIR_RUN_UNIT_TESTS)
-  mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0 G_SLICE=always-malloc G_DEBUG=gc-friendly)
+  mir_discover_tests(mir_unit_tests
+                       LD_PRELOAD=libumockdev-preload.so.0
+                       G_SLICE=always-malloc
+                       G_DEBUG=gc-friendly
+                       MIR_CLIENT_PLATFORM_LIB=${LIBRARY_OUTPUT_PATH}/${MIR_CLIENT_PLATFORM})
 endif (MIR_RUN_UNIT_TESTS)
 
 install(

=== modified file 'tests/unit-tests/client/CMakeLists.txt'
--- tests/unit-tests/client/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ tests/unit-tests/client/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -12,6 +12,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_rpc_channel.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_mir_prompt_session.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_event_distributor.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_probing_client_platform_factory.cpp
 )
 
 if(MIR_TEST_PLATFORM STREQUAL "android")

=== modified file 'tests/unit-tests/client/android/test_android_client_platform.cpp'
--- tests/unit-tests/client/android/test_android_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/android/test_android_client_platform.cpp	2014-09-10 08:00:52 +0000
@@ -17,9 +17,9 @@
  */
 
 #include "src/client/client_platform.h"
-#include "src/client/android/client_platform_factory.h"
 #include "mir_test_doubles/mock_client_context.h"
 #include "mir_test_doubles/mock_client_surface.h"
+#include "mir_test_framework/client_platform_factory.h"
 
 #include <EGL/egl.h>
 
@@ -28,13 +28,12 @@
 namespace mcl = mir::client;
 namespace mt = mir::test;
 namespace mtd = mt::doubles;
+namespace mtf = mir_test_framework;
 
 TEST(AndroidClientPlatformTest, egl_native_display_is_egl_default_display)
 {
-    mtd::MockClientContext context;
-    mcl::android::ClientPlatformFactory factory;
     mtd::MockClientSurface surface;
-    auto platform = factory.create_client_platform(&context);
+    auto platform = mtf::create_android_client_platform();
     auto mock_client_surface = std::make_shared<mtd::MockClientSurface>();
     auto native_display = platform->create_egl_native_display();
     EXPECT_EQ(EGL_DEFAULT_DISPLAY, *native_display);
@@ -42,10 +41,8 @@
 
 TEST(AndroidClientPlatformTest, egl_native_window_is_set)
 {
-    mtd::MockClientContext context;
-    mcl::android::ClientPlatformFactory factory;
     mtd::MockClientSurface surface;
-    auto platform = factory.create_client_platform(&context);
+    auto platform = mtf::create_android_client_platform();
     auto mock_client_surface = std::make_shared<mtd::MockClientSurface>();
     auto egl_native_window = platform->create_egl_native_window(&surface);
     EXPECT_NE(nullptr, egl_native_window);

=== modified file 'tests/unit-tests/client/mesa/test_client_platform.cpp'
--- tests/unit-tests/client/mesa/test_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/mesa/test_client_platform.cpp	2014-09-10 08:00:52 +0000
@@ -17,9 +17,9 @@
  */
 
 #include "src/client/client_platform.h"
-#include "src/client/mesa/client_platform_factory.h"
+#include "mir/shared_library.h"
 #include "src/client/mesa/mesa_native_display_container.h"
-#include "mir_test_doubles/mock_client_context.h"
+#include "mir_test_framework/client_platform_factory.h"
 #include "mir_test_doubles/mock_client_surface.h"
 
 #include "mir_toolkit/mesa/native_display.h"
@@ -30,19 +30,20 @@
 namespace mclm = mir::client::mesa;
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
+namespace mtf = mir_test_framework;
 
 TEST(MesaClientPlatformTest, egl_native_display_is_valid_until_released)
 {
-    mtd::MockClientContext context;
-    mclm::ClientPlatformFactory factory;
-    auto platform = factory.create_client_platform(&context);
+    auto platform = mtf::create_mesa_client_platform();
+    auto platform_lib = mtf::get_platform_library();
 
     MirMesaEGLNativeDisplay* nd;
     {
         std::shared_ptr<EGLNativeDisplayType> native_display = platform->create_egl_native_display();
 
         nd = reinterpret_cast<MirMesaEGLNativeDisplay*>(*native_display);
-        EXPECT_EQ(MIR_MESA_TRUE, mclm::mir_client_mesa_egl_native_display_is_valid(nd));
+        auto validate = platform_lib->load_function<MirBool(*)(MirMesaEGLNativeDisplay*)>("mir_client_mesa_egl_native_display_is_valid");
+        EXPECT_EQ(MIR_MESA_TRUE, validate(nd));
     }
     EXPECT_EQ(MIR_MESA_FALSE, mclm::mir_client_mesa_egl_native_display_is_valid(nd));
 }

=== modified file 'tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp'
--- tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/mesa/test_mesa_native_display_container.cpp	2014-09-10 08:00:52 +0000
@@ -40,7 +40,7 @@
     }
 
     std::shared_ptr<mclg::MesaNativeDisplayContainer> const container;
-    MirConnection* connection;
+    mir::client::ClientContext* connection;
 };
 
 }

=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
--- tests/unit-tests/client/test_client_platform.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/client/test_client_platform.cpp	2014-09-10 08:00:52 +0000
@@ -20,60 +20,140 @@
 #include "src/client/mir_client_surface.h"
 #include "mir_test_doubles/mock_client_context.h"
 #include "mir_test_doubles/mock_client_surface.h"
+#include "mir_test_framework/executable_path.h"
 
-#ifdef ANDROID
+#ifdef MIR_BUILD_PLATFORM_ANDROID
 #include "mir_test_doubles/mock_android_hw.h"
-#include "src/client/android/client_platform_factory.h"
-#else
-#include "src/client/mesa/client_platform_factory.h"
 #endif
 
+#include "src/client/client_platform_factory.h"
+
+#include "mir/shared_library.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace mcl=mir::client;
 namespace mtd = mir::test::doubles;
-
-struct ClientPlatformTest : public ::testing::Test
-{
+namespace mtf = mir_test_framework;
+
+namespace
+{
+struct ClientPlatformTraits
+{
+    ClientPlatformTraits(std::string const& library,
+                         std::function<void(MirPlatformPackage&)> populator,
+                         MirPlatformType type)
+        : platform_library_name{library},
+          populate_package_for{populator},
+          platform_type{type}
+    {
+    }
+
+    std::string const platform_library_name;
+    std::function<void(MirPlatformPackage&)> const populate_package_for;
+    MirPlatformType const platform_type;
+};
+
+struct ClientPlatformTest : public ::testing::TestWithParam<ClientPlatformTraits const*>
+{
+    ClientPlatformTest()
+        : platform_library{mtf::library_path() + "/" + GetParam()->platform_library_name},
+          create_client_platform{platform_library.load_function<mcl::CreateClientPlatform>("create_client_platform")},
+          probe{platform_library.load_function<mcl::ClientPlatformProbe>("is_appropriate_module")}
+    {
+        using namespace testing;
+        ON_CALL(context, populate(_))
+            .WillByDefault(Invoke(GetParam()->populate_package_for));
+    }
+
     mtd::MockClientContext context;
-#ifdef ANDROID
+#ifdef MIR_BUILD_PLATFORM_ANDROID
     testing::NiceMock<mtd::HardwareAccessMock> hw_access_mock;
-    mcl::android::ClientPlatformFactory factory;
-#else
-    mcl::mesa::ClientPlatformFactory factory;
 #endif
+    mir::SharedLibrary platform_library;
+    mcl::CreateClientPlatform const create_client_platform;
+    mcl::ClientPlatformProbe const probe;
 };
 
-TEST_F(ClientPlatformTest, platform_name)
-{
-    auto platform = factory.create_client_platform(&context);
-#ifdef ANDROID
-    auto type = mir_platform_type_android;
-#else
-    auto type = mir_platform_type_gbm;
-#endif
-    EXPECT_EQ(type, platform->platform_type());
-}
-
-TEST_F(ClientPlatformTest, platform_creates)
-{
-    auto platform = factory.create_client_platform(&context);
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+ClientPlatformTraits const android_platform{"client-platform-android.so",
+                                            [](MirPlatformPackage& pkg)
+                                            {
+                                                ::memset(&pkg, 0, sizeof(pkg));
+                                            },
+                                            mir_platform_type_android
+                                           };
+
+INSTANTIATE_TEST_CASE_P(Android,
+                        ClientPlatformTest,
+                        ::testing::Values(&android_platform));
+
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+ClientPlatformTraits const mesa_platform{"client-platform-mesa.so",
+                                         [](MirPlatformPackage& pkg)
+                                         {
+                                             ::memset(&pkg, 0, sizeof(pkg));
+                                             pkg.fd_items = 1;
+                                         },
+                                         mir_platform_type_gbm
+                                        };
+
+INSTANTIATE_TEST_CASE_P(Mesa,
+                        ClientPlatformTest,
+                        ::testing::Values(&mesa_platform));
+
+#endif
+}
+
+TEST_P(ClientPlatformTest, platform_name)
+{
+    auto platform = create_client_platform(&context);
+
+    EXPECT_EQ(GetParam()->platform_type, platform->platform_type());
+}
+
+TEST_P(ClientPlatformTest, platform_creates)
+{
+    auto platform = create_client_platform(&context);
     auto buffer_factory = platform->create_buffer_factory();
     EXPECT_NE(buffer_factory.get(), (mcl::ClientBufferFactory*) NULL);
 }
 
-TEST_F(ClientPlatformTest, platform_creates_native_window)
+TEST_P(ClientPlatformTest, platform_creates_native_window)
 {
-    auto platform = factory.create_client_platform(&context);
+    auto platform = create_client_platform(&context);
     auto mock_client_surface = std::make_shared<mtd::MockClientSurface>();
     auto native_window = platform->create_egl_native_window(mock_client_surface.get());
     EXPECT_NE(*native_window, (EGLNativeWindowType) NULL);
 }
 
-TEST_F(ClientPlatformTest, platform_creates_egl_native_display)
+TEST_P(ClientPlatformTest, platform_creates_egl_native_display)
 {
-    auto platform = factory.create_client_platform(&context);
+    auto platform = create_client_platform(&context);
     auto native_display = platform->create_egl_native_display();
     EXPECT_NE(nullptr, native_display.get());
 }
+
+TEST_P(ClientPlatformTest, platform_probe_returns_success_when_matching)
+{
+    EXPECT_TRUE(probe(&context));
+}
+
+TEST_P(ClientPlatformTest, platform_probe_returns_false_when_not_matching)
+{
+    using namespace testing;
+    ON_CALL(context, populate(_))
+        .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                              {
+                                  //Mock up something that hopefully looks nothing like
+                                  //what the platform is expecting...
+                                  ::memset(&pkg, 0, sizeof(pkg));
+                                  pkg.data_items = 0xdeadbeef;
+                                  pkg.fd_items = -23;
+                              }));
+
+    EXPECT_FALSE(probe(&context));
+}

=== added file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp'
--- tests/unit-tests/client/test_probing_client_platform_factory.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/client/test_probing_client_platform_factory.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "src/client/client_platform.h"
+#include "src/client/probing_client_platform_factory.h"
+
+#include "mir_test_doubles/mock_client_context.h"
+#include "mir_test_framework/executable_path.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace mtf = mir_test_framework;
+namespace mtd = mir::test::doubles;
+
+namespace
+{
+std::vector<std::shared_ptr<mir::SharedLibrary>>
+all_available_modules()
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
+#ifdef MIR_BUILD_PLATFORM_MESA
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-platform-mesa.so"));
+#endif
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-platform-android.so"));
+#endif
+    return modules;
+}
+}
+
+TEST(ProbingClientPlatformFactory, ThrowsErrorWhenConstructedWithNoPlatforms)
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules;
+    EXPECT_THROW(mir::client::ProbingClientPlatformFactory{empty_modules},
+                 std::runtime_error);
+}
+
+TEST(ProbingClientPlatformFactory, ThrowsErrorWhenNoPlatformPluginProbesSuccessfully)
+{
+    using namespace testing;
+
+    mir::client::ProbingClientPlatformFactory factory{all_available_modules()};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                               // Mock up a platform package that looks nothing like
+                               // either an Android or Mesa package
+                               pkg.fd_items = 0xdeadbeef;
+                               pkg.data_items = -23;
+                           }));
+
+    EXPECT_THROW(factory.create_client_platform(&context),
+                 std::runtime_error);
+}
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+TEST(ProbingClientPlatformFactory, CreatesMesaPlatformWhenAppropriate)
+{
+    using namespace testing;
+
+    mir::client::ProbingClientPlatformFactory factory{all_available_modules()};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                               // Mock up something that looks like a GBM platform package,
+                               // until we send the actual platform type over the wire!
+                               pkg.fd_items = 1;
+                               pkg.fd[0] = 23;
+                           }));
+    auto platform = factory.create_client_platform(&context);
+    EXPECT_EQ(mir_platform_type_gbm, platform->platform_type());
+}
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+TEST(ProbingClientPlatformFactory, CreatesAndroidPlatformWhenAppropriate)
+{
+    using namespace testing;
+
+    mir::client::ProbingClientPlatformFactory factory{all_available_modules()};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               // Mock up something that looks like a Android platform package,
+                               // until we send the actual platform type over the wire!
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                           }));
+
+    auto platform = factory.create_client_platform(&context);
+    EXPECT_EQ(mir_platform_type_android, platform->platform_type());
+}
+#endif
+
+TEST(ProbingClientPlatformFactory, IgnoresNonClientPlatformModules)
+{
+    using namespace testing;
+
+    auto modules = all_available_modules();
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/libmirserver.so"));
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-platform-dummy.so"));
+
+    mir::client::ProbingClientPlatformFactory factory{modules};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               // Mock up something that looks like a Dummy platform package,
+                               // until we send the actual platform type over the wire!
+                               ::memset(&pkg, 0, sizeof(MirPlatformPackage));
+                               pkg.data_items = 20;
+                               strcpy(reinterpret_cast<char*>(pkg.data), "Dummy platform");
+                           }));
+
+    auto platform = factory.create_client_platform(&context);
+}

=== modified file 'tests/unit-tests/graphics/CMakeLists.txt'
--- tests/unit-tests/graphics/CMakeLists.txt	2014-09-08 04:12:17 +0000
+++ tests/unit-tests/graphics/CMakeLists.txt	2014-09-10 08:00:52 +0000
@@ -10,6 +10,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/test_surfaceless_egl_context.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_overlapping_output_grouping.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_program_factory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_prober.cpp
 )
 
 add_subdirectory(nested/)

=== modified file 'tests/unit-tests/graphics/android/test_android_platform.cpp'
--- tests/unit-tests/graphics/android/test_android_platform.cpp	2014-09-08 04:12:17 +0000
+++ tests/unit-tests/graphics/android/test_android_platform.cpp	2014-09-10 08:00:52 +0000
@@ -29,6 +29,8 @@
 #include "mir_test_doubles/fd_matcher.h"
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/mock_android_native_buffer.h"
+#include "mir_test_framework/executable_path.h"
+#include "mir/shared_library.h"
 #include <system/window.h>
 #include <gtest/gtest.h>
 
@@ -39,6 +41,7 @@
 namespace mr=mir::report;
 namespace geom=mir::geometry;
 namespace mo=mir::options;
+namespace mtf=mir_test_framework;
 
 class PlatformBufferIPCPackaging : public ::testing::Test
 {
@@ -154,6 +157,27 @@
     EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display());
 }
 
+TEST(AndroidGraphicsPlatform, probe_returns_unsupported_when_no_hwaccess)
+{
+    using namespace testing;
+    NiceMock<mtd::HardwareAccessMock> hwaccess;
+
+    ON_CALL(hwaccess, hw_get_module(_,_)).WillByDefault(Return(-1));
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-android.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
+}
+
+TEST(AndroidGraphicsPlatform, probe_returns_best_when_hwaccess_succeeds)
+{
+    testing::NiceMock<mtd::HardwareAccessMock> hwaccess;
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-android.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::best, probe());
+}
+
 TEST(NestedPlatformCreation, doesnt_access_display_hardware)
 {
     using namespace testing;

=== modified file 'tests/unit-tests/graphics/android/test_output_builder.cpp'
--- tests/unit-tests/graphics/android/test_output_builder.cpp	2014-09-09 12:41:41 +0000
+++ tests/unit-tests/graphics/android/test_output_builder.cpp	2014-09-10 08:00:52 +0000
@@ -113,6 +113,7 @@
     std::shared_ptr<mga::HwcLogger> logger{std::make_shared<mga::NullHwcLogger>()};
 };
 }
+
 TEST_F(OutputBuilder, hwc_version_10_success)
 {
     using namespace testing;

=== modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_platform.cpp	2014-09-08 04:12:17 +0000
+++ tests/unit-tests/graphics/mesa/test_platform.cpp	2014-09-10 08:00:52 +0000
@@ -23,6 +23,7 @@
 #include "src/platform/graphics/mesa/internal_client.h"
 #include "src/server/report/null_report_factory.h"
 #include "mir/emergency_cleanup_registry.h"
+#include "mir/shared_library.h"
 
 #include "mir_test_doubles/mock_buffer.h"
 #include "mir_test_doubles/mock_buffer_packer.h"
@@ -33,6 +34,7 @@
 #include <gtest/gtest.h>
 
 #include "mir_test_framework/udev_environment.h"
+#include "mir_test_framework/executable_path.h"
 #include "mir_test/pipe.h"
 
 #include "mir_test_doubles/mock_drm.h"
@@ -384,3 +386,23 @@
 
     Mock::VerifyAndClearExpectations(&mock_drm);
 }
+
+TEST_F(MesaGraphicsPlatform, probe_returns_unsupported_when_no_drm_udev_devices)
+{
+    mtf::UdevEnvironment udev_environment;
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-mesa.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
+}
+
+TEST_F(MesaGraphicsPlatform, probe_returns_best_when_drm_devices_exist)
+{
+    mtf::UdevEnvironment udev_environment;
+
+    udev_environment.add_standard_device("standard-drm-devices");
+
+    mir::SharedLibrary platform_lib{mtf::library_path() + "/platform-graphics-mesa.so"};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>("probe_platform");
+    EXPECT_EQ(mg::PlatformPriority::best, probe());
+}

=== added file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2014-09-10 08:00:52 +0000
@@ -0,0 +1,212 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+
+#include "src/platform/graphics/platform_probe.h"
+#include "mir/graphics/platform.h"
+
+#include "mir/raii.h"
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+#include "mir_test_doubles/mock_drm.h"
+#include "mir_test_doubles/mock_gbm.h"
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+#include "mir_test_doubles/mock_android_hw.h"
+#endif
+
+#include "mir_test_framework/udev_environment.h"
+#include "mir_test_framework/executable_path.h"
+
+namespace mtf = mir_test_framework;
+namespace mtd = mir::test::doubles;
+
+namespace
+{
+std::vector<std::shared_ptr<mir::SharedLibrary>> available_platforms()
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/platform-graphics-mesa.so"));
+#endif
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/platform-graphics-android.so"));
+#endif
+    return modules;
+}
+
+void add_dummy_platform(std::vector<std::shared_ptr<mir::SharedLibrary>>& modules)
+{
+    modules.insert(modules.begin(), std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/platform-graphics-dummy.so"));
+}
+
+std::shared_ptr<void> ensure_android_probing_fails()
+{
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    using namespace testing;
+    auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>();
+    ON_CALL(*mock_android, hw_get_module(_, _))
+       .WillByDefault(Return(-1));
+    return mock_android;
+#else
+    return std::shared_ptr<void>{};
+#endif
+}
+
+std::shared_ptr<void> ensure_mesa_probing_fails()
+{
+    return std::make_shared<mtf::UdevEnvironment>();
+}
+
+std::shared_ptr<void> ensure_mesa_probing_succeeds()
+{
+    auto udev = std::make_shared<mtf::UdevEnvironment>();
+
+    udev->add_standard_device("standard-drm-devices");
+
+    return udev;
+}
+
+std::shared_ptr<void> ensure_android_probing_succeeds()
+{
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    using namespace testing;
+    auto mock_android = std::make_shared<NiceMock<mtd::HardwareAccessMock>>();
+    ON_CALL(*mock_android, hw_get_module(_, _))
+       .WillByDefault(Return(0));
+    return mock_android;
+#else
+    return std::shared_ptr<void>{};
+#endif
+}
+}
+
+TEST(ServerPlatformProbe, ConstructingWithNoModulesIsAnError)
+{
+    std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules;
+    EXPECT_THROW(mir::graphics::module_for_device(empty_modules),
+                 std::runtime_error);
+}
+
+#ifdef MIR_BUILD_PLATFORM_MESA
+TEST(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent)
+{
+    using namespace testing;
+    auto block_android = ensure_android_probing_fails();
+    auto fake_mesa = ensure_mesa_probing_succeeds();
+
+    auto modules = available_platforms();
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, HasSubstr("mesa"));
+}
+#endif
+
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+TEST(ServerPlatformProbe, LoadsAndroidPlatformWhenHwaccessSucceeds)
+{
+    using namespace testing;
+
+    auto block_mesa = ensure_mesa_probing_fails();
+    auto fake_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, HasSubstr("android"));
+}
+#endif
+
+TEST(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully)
+{
+    using namespace testing;
+    auto block_android = ensure_android_probing_fails();
+    auto block_mesa = ensure_mesa_probing_fails();
+
+
+    EXPECT_THROW(mir::graphics::module_for_device(available_platforms()),
+                 std::runtime_error);
+}
+
+TEST(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule)
+{
+    using namespace testing;
+    auto block_android = ensure_android_probing_fails();
+    auto block_mesa = ensure_mesa_probing_fails();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, HasSubstr("dummy"));
+}
+
+TEST(ServerPlatformProbe, LoadsMesaOrAndroidInPreferenceToDummy)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    auto module = mir::graphics::module_for_device(modules);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, Not(HasSubstr("dummy")));
+}
+
+TEST(ServerPlatformProbe, IgnoresNonPlatformModules)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() +
+                                                           "/libmirclient.so"));
+
+
+    auto module = mir::graphics::module_for_device(modules);
+    EXPECT_NE(nullptr, module);
+}

=== modified file 'tests/unit-tests/shared_library_test.cpp'
--- tests/unit-tests/shared_library_test.cpp	2013-06-21 12:08:34 +0000
+++ tests/unit-tests/shared_library_test.cpp	2014-09-10 08:00:52 +0000
@@ -21,15 +21,19 @@
 #include <gtest/gtest.h>
 
 #include <boost/exception/diagnostic_information.hpp>
-
 #include <stdexcept>
 
+#include "mir_test_framework/executable_path.h"
+
+namespace mtf = mir_test_framework;
+
 namespace
 {
 class HasSubstring
 {
 public:
     HasSubstring(char const* substring) : substring(substring) {}
+    HasSubstring(std::string const& substring) : substring{substring.c_str()} {}
 
     friend::testing::AssertionResult operator,(std::string const& target, HasSubstring const& match)
     {
@@ -50,18 +54,35 @@
 
 #define EXPECT_THAT(target, condition) EXPECT_TRUE((target, condition))
 
-char const* const nonexistent_library  = "nonexistent_library";
-char const* const existing_library     = "libmirplatformgraphics.so";
-char const* const nonexistent_function = "nonexistent_library";
-char const* const existing_function    = "create_platform";
+class SharedLibrary : public testing::Test
+{
+public:
+    SharedLibrary()
+        : nonexistent_library{"imma_totally_not_a_library"},
+          existing_library{mtf::library_path() + "/client-platform-mesa.so"},
+          nonexistent_function{"yo_dawg"},
+          existing_function{"create_client_platform"},
+          existent_version{"MIR_CLIENTPLATFORM_1"},
+          nonexistent_version{"GOATS_ON_THE_GREEN"}
+    {
+    }
+
+    std::string const nonexistent_library;
+    std::string const existing_library;
+    std::string const nonexistent_function;
+    std::string const existing_function;
+    std::string const existent_version;
+    std::string const nonexistent_version;
+};
+
 }
 
-TEST(SharedLibrary, load_nonexistent_library_fails)
+TEST_F(SharedLibrary, load_nonexistent_library_fails)
 {
     EXPECT_THROW({ mir::SharedLibrary nonexistent(nonexistent_library); }, std::runtime_error);
 }
 
-TEST(SharedLibrary, load_nonexistent_library_fails_with_useful_info)
+TEST_F(SharedLibrary, load_nonexistent_library_fails_with_useful_info)
 {
     try
     {
@@ -76,19 +97,19 @@
     }
 }
 
-TEST(SharedLibrary, load_valid_library_works)
+TEST_F(SharedLibrary, load_valid_library_works)
 {
     mir::SharedLibrary existing(existing_library);
 }
 
-TEST(SharedLibrary, load_nonexistent_function_fails)
+TEST_F(SharedLibrary, load_nonexistent_function_fails)
 {
     mir::SharedLibrary existing(existing_library);
 
     EXPECT_THROW({ existing.load_function<void(*)()>(nonexistent_function); }, std::runtime_error);
 }
 
-TEST(SharedLibrary, load_nonexistent_function_fails_with_useful_info)
+TEST_F(SharedLibrary, load_nonexistent_function_fails_with_useful_info)
 {
     mir::SharedLibrary existing(existing_library);
 
@@ -106,9 +127,33 @@
     }
 }
 
-TEST(SharedLibrary, load_valid_function_works)
+TEST_F(SharedLibrary, load_valid_function_works)
 {
     mir::SharedLibrary existing(existing_library);
     existing.load_function<void(*)()>(existing_function);
 }
 
+TEST_F(SharedLibrary, load_valid_versioned_function_works)
+{
+    mir::SharedLibrary existing{existing_library};
+    existing.load_function<void(*)()>(existing_function, existent_version);
+}
+
+TEST_F(SharedLibrary, load_invalid_versioned_function_fails_with_appropriate_error)
+{
+    mir::SharedLibrary existing{existing_library};
+
+    try
+    {
+        existing.load_function<void(*)()>(existing_function, nonexistent_version);
+    }
+    catch (std::exception const& error)
+    {
+        auto info = boost::diagnostic_information(error);
+
+        EXPECT_THAT(info, HasSubstring("undefined symbol")) << "What went wrong";
+        EXPECT_THAT(info, HasSubstring(nonexistent_version)) << "Version info";
+        EXPECT_THAT(info, HasSubstring(existing_library)) << "Name of library";
+        EXPECT_THAT(info, HasSubstring(existing_function)) << "Name of function";
+    }
+}

=== modified file 'tests/unit-tests/test_shared_library_prober.cpp'
--- tests/unit-tests/test_shared_library_prober.cpp	2014-09-08 04:21:49 +0000
+++ tests/unit-tests/test_shared_library_prober.cpp	2014-09-10 08:00:52 +0000
@@ -26,6 +26,7 @@
 #include <cstring>
 
 #include <system_error>
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -33,6 +34,7 @@
 
 namespace
 {
+
 class MockSharedLibraryProberReport : public mir::SharedLibraryProberReport
 {
 public:

=== modified file 'tools/valgrind_suppressions_armhf'
--- tools/valgrind_suppressions_armhf	2014-03-26 05:48:59 +0000
+++ tools/valgrind_suppressions_armhf	2014-09-10 08:00:52 +0000
@@ -119,6 +119,15 @@
 # memory errors.
 
 {
+   spurious_strlen_addr4
+   Memcheck:Addr4
+   ...
+   fun:dlsym
+   ...
+   fun:_ZN50SharedLibrary_load_nonexistent_function_fails_Test8TestBodyEv
+}
+
+{
     mir_sharedlibrary_cond
     Memcheck:Cond
     fun:_ZN3mir13SharedLibraryC1EPKc