Merge lp:~mir-team/mir/probe-client-drivers into lp:mir

[Andreas Pokorny]

Add probing for client platform modules.

The client library now looks in MIR_CLIENT_PLATFORM_PATH (usually /usr/lib/*/mir/client-platform) and loads all the modules it finds in there. At connection time each of those modules are checked whether the MirPlatformPackage matches what they expect; the first one that matches is used.

The smallest individually landable piece of proper driver probing; the client library side of it.

[Daniel van Vugt (vanvugt)]

(1) Orphaned comment now needs removing:
16 # Why does this have to come after mir-test-framework here but not in tests/acceptance-tests/
17 # /CMakeLists.txt? ~racarr
18 - mirplatform

(2) Unnecessary (and undesirable) formatting changes:
221 -target_link_libraries(mirclient
222 +target_link_libraries(
223 + mirclient
224 +
because the first parameter is special and independent of those that follow it.

(3) Remind me why we wanted a C calling convention for C++ code?
372 +extern "C" std::shared_ptr<mcl::ClientPlatform>

(4) Minor optimization: You can avoid a template instantiation using std::atomic_bool for
898 + std::atomic<bool> connect_done;

(5) Fatal: Clients don't start any more:
$ bin/mir_demo_client_egltriangle
Can't get connection
$ bin/mir_demo_client_flicker
Starting
mir_demo_client_flicker: /home/dan/bzr/mir/tmp.pcd/examples/flicker.c:134: main: Assertion `mir_connection_is_valid(connection)' failed.

(6) ProbingClientPlatformFactory sounds a bit awkward. Although I haven't stopped to understand the code enough to suggest anything better yet.

(7) New (old) function exposed without a new stanza. Should be MIR_COMMON_3.1 (?)
980 +++ src/common/symbols.map 2014-11-28 05:44:33 +0000
981 @@ -150,6 +150,7 @@
982 # but they are used by libmirplatform, libmirclient or libmirserver
983 mir::default_server_socket;
984 mir::input::android::Lexicon::translate*;
985 + mir::libraries_for_path*;

review: Needs Fixing

[Chris Halse Rogers (raof)]

(3) We need C calling convention because I'm not going to write load_symbol("_Zsharedptr23mirZclientZ23PIZZA22112stinkybobo888zzz") :)

(5) PEBCAK - You're trying to run those uninstalled; the client library is (probably) looking for platform modules in /usr/local/mir/client-platform/, and not finding them. If our examples actually called mir_connection_get_error() then you'd see that error :).

Set MIR_CLIENT_PLATFORM_PATH=$(pwd)/lib/client-modules and it'll work uninstalled.

I'll fix the rest.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2119
http://jenkins.qa.ubuntu.com/job/mir-ci/2288/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/384/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/358
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/279/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/358
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/358/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

> Set MIR_CLIENT_PLATFORM_PATH=$(pwd)/lib/client-modules and it'll work uninstalled.

Note that it's not just the examples but also the tests that need this.

This is bad in two ways:

1. It's more complicated to run executables from inside the build dir.
2. Forgetting to set the proper path may lead to platform libraries from the system being used inadvertently, instead of the expected ones from inside the build dir.

Until now, executing anything from inside the build dir was guaranteed to prefer code from that directory (due to cmake setting RPATH). This setup has served us well and I think we should keep it, even if doing so involves some hackery.

One way would be to search for platform libs in all the places the dynamic linker would look for, but unfortunately there doesn't seem to be a way to access the shared library search paths directly.

Another way would be to take advantage of the RPATH setting, for example:

1. Create a mir/libmirtestconfig.so which exports symbols/functions to get the test platform search path
2. Build it in build/lib/, but don't install it.
3. When figuring out where to search for the platform libs ([1]), try to load the mir/libmirtestconfig.so library and get the test path.
  3.1. In case of an executable/library from the build dir, mir/libmirtestconfig.so will be found (due to RPATH) and the test values will be used.
  3.2. In case of an installed executable/library no RPATH is present and mir/libmirtestconfig.so will not be found.

[1] In mcl::DefaultConnectionConfiguration::the_client_platform_factory()

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> (5) PEBCAK - You're trying to run those uninstalled; the client library is
> (probably) looking for platform modules in /usr/local/mir/client-platform/,
> and not finding them. If our examples actually called
> mir_connection_get_error() then you'd see that error :).
>
> Set MIR_CLIENT_PLATFORM_PATH=$(pwd)/lib/client-modules and it'll work
> uninstalled.

That doesn't seem like an adequate answer:

We've always been able to run the built binaries from within the build tree (cmake does rpath magic).

This makes it far too easy to accidentally load the wrong (installed) binaries. Could we e.g. look relative to the current library?

review: Needs Fixing

[Robert Carr (robertcarr)]

Seems ok but yeah it would be nice to load from the build dir. One trick ive seen is to use wrapper scripts for the binaries in the build-dir (not installed of course) which exports the appropriate var.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2120
http://jenkins.qa.ubuntu.com/job/mir-ci/2302/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/399/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/373
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/293/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/373
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/373/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3613
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16364

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I like the idea of taking advantage of RPATH. One of the best (and worst) things about CMake is its RPATH behaviour. And it's designed that way precisely so you can run things in-situ within the source tree. Haven't assessed alf's plan in detail though.

[Daniel van Vugt (vanvugt)]

There's a hint in the dlopen docs about how it might be achieved:

   dlopen()
       ...
       o (ELF only) If the executable file for the calling program contains
           a DT_RPATH tag, and does not contain a DT_RUNPATH tag, then the
           directories listed in the DT_RPATH tag are searched.

[Chris Halse Rogers (raof)]

Yeah, dlopen("libmirtestconfig.so") would work.

I'm doing the CMakery required to provide wrapper scripts, though. I
strongly prefer that the release build not contain code required only
to set up the test environment.

[Alexandros Frantzis (afrantzis)]

> I'm doing the CMakery required to provide wrapper scripts, though

Please make sure that it's still easy to run the examples and tests with gdb/valgrind/other tools.

[Cemil Azizoglu (cemil-azizoglu)]

Needs information:

Has this been tested under chroot/sbuild? (We don't wanna have last minute packaging issues during release.)

Nits/Comments:
719 + // TODO: Actually check what platform we're using, rather than blindly

Perhaps MirPlatformPackage should include a "platform signature". Something like "MESA", "ANDR", "STUB".
-----------------------
android.so, mesa.so, dummy.so are too generic. client-platform-{android|mesa|dummy}.so perhaps?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2128
http://jenkins.qa.ubuntu.com/job/mir-ci/2314/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/415/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/415
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/389/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/305/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/389/console

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

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

@Cemil - tested, and passed, under sbuild.

I think I'd like to handle platform discovery a slightly different way; at the moment, MirPlatformPackage contains enough data to be a unique signature in itself.

The drivers are android.so, mesa.so, etc because they're in the client-platform/ directory. Their full name looks like client-platform/mesa.so, client-platform/android.so, etc.

I think client-platform/client-platform-mesa.so, etc look a bit silly :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2130
http://jenkins.qa.ubuntu.com/job/mir-ci/2316/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/417/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/417
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/391/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/307/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/391/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2131
http://jenkins.qa.ubuntu.com/job/mir-ci/2318/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/309
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/309/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/393
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3628
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16434

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

$MIR_CLIENT_PLATFORM_PATH and the executable_path() hack looks fragile.

We could write DefaultConnectionConfiguration::the_client_platform_factory() to use dladdr() to locate libmirclient.so and locate the client-modules directory relative to that? (which should be the same in tree and installed.)

review: Needs Fixing

[Chris Halse Rogers (raof)]

I'm not entirely sure what you think is fragile about executable_path()? We're already using it elsewhere in the tests.

If you're concerned about the ../lib/ relative path, then; whoops! Now uses mtf::library_path().

I much prefer the current solution to using dladdr() in the release code. Using dladdr() we make some assumptions about the code that the compiler emits and if those assumptions fail then our release code fails. If the assumptions we set MIR_CLIENT_PLATFORM_PATH based on fail then at worst our test suite fails.

Regardless of how we find the platform libraries by default we'll want a MIR_CLIENT_PLATFORM_PATH option for roughly the same reasons that we have a MIR_CLIENT_PLATFORM_LIB option.

[Andreas Pokorny (andreas-pokorny)]

There already is a stub_client_buffer{_factory}.h do we need a different one?

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> I'm not entirely sure what you think is fragile about executable_path()? We're
> already using it elsewhere in the tests.

Having looked again I think I misunderstood how this solution works. It isn't as bad as I thought.

review: Abstain

[Alan Griffiths (alan-griffiths)]

183 === added file 'cmake/wrapper-script'
184 --- cmake/wrapper-script 1970-01-01 00:00:00 +0000
185 +++ cmake/wrapper-script 2014-12-03 22:58:17 +0000
186 @@ -0,0 +1,5 @@
187 +#!/bin/sh
188 +
189 +export MIR_CLIENT_PLATFORM_PATH=@BUILD_PREFIX@/lib/client-modules
190 +
191 +exec @BUILD_PREFIX@/bin/@EXECUTABLE@ $@

Isn't this obsolete?

review: Needs Fixing

[Cemil Azizoglu (cemil-azizoglu)]

> @Cemil - tested, and passed, under sbuild.

Great. How about testing downstreams by installing the generated packages?

review: Needs Information

[Chris Halse Rogers (raof)]

@Cemil - downstreams built and happy.

[Alan Griffiths (alan-griffiths)]

62 +#include <error.h>
...
73 + error(1, 0, "Surface creation failed: %s\n", mir_surface_get_error_message(surface));

I think this is our first use of this GNU extension. I'm not opposed, but think it needs discussion before adding this dependency.

~~~~

671 + auto it = valid_displays.find(display);
672 + if (it == valid_displays.end())
673 + return;
674 +
675 + valid_displays.erase(it);

AFICS this is a verbose and inefficient

    valid_displays.erase(display);

But I wouldn't block on it as it isn't a critical path.

~~~~

741 + throw new std::runtime_error{"Attempted to create Android client platform on non-Android server"};

1. Don't throw pointers
2. Use BOOST_THROW_EXCEPTION

~~~~

1067 + throw std::runtime_error{"Attempted to create Mesa client platform on non-Mesa server"};
...
1602 + throw std::logic_error{"Must call one of create_*_client_platform() before calling get_platform_library()"};

Use BOOST_THROW_EXCEPTION

review: Needs Fixing

[Cemil Azizoglu (cemil-azizoglu)]

Assuming downstreams not just build, but also run happily, I have no more to add.

review: Approve

[Alan Griffiths (alan-griffiths)]

Diff against target: 2448 lines (+975/-294) 68 files modified (has conflicts)

Text conflict in examples/CMakeLists.txt

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

(2) Unnecessary (and undesirable) formatting changes:
575 -target_link_libraries(mirclient
576 +target_link_libraries(
577 + mirclient
578 +
because the first parameter is special and independent of those that follow it.

(4) Minor optimization: You can avoid a template instantiation using std::atomic_bool for
1250 + std::atomic<bool> connect_done;

(8) The library re-ordering appears to be pointless, or is there a reason?...
benchmarks/frame-uniformity/CMakeLists.txt
Can we revert all changes to that file?

(9) Clients now start, but the wrapper that makes it possible feels inelegant...
$ ls -a bin/
mir_acceptance_tests
.mir_acceptance_tests-uninstalled
mir_demo_client_basic
.mir_demo_client_basic-uninstalled
mir_demo_client_cursors
.mir_demo_client_cursors-uninstalled
mir_demo_client_display_config
.mir_demo_client_display_config-uninstalled
mir_demo_client_eglcounter
.mir_demo_client_eglcounter-uninstalled
...
I suspect we can do better without needing a wrapper. But if we do use this then please don't hide binaries from developers: ".foo-uninstalled" should be "foo.bin"

(10) wrapper.c compiles to 10KB, but could be replaced with a trivial shell script instead.

(11) This is new on the end. What's it do?
1343 +} MIR_COMMON_3;

review: Needs Fixing

[Chris Halse Rogers (raof)]

On Wed, Dec 10, 2014 at 2:44 PM, Daniel van Vugt
<email address hidden> wrote:
> Review: Needs Fixing
>
> (2) Unnecessary (and undesirable) formatting changes:
> 575 -target_link_libraries(mirclient
> 576 +target_link_libraries(
> 577 + mirclient
> 578 +
> because the first parameter is special and independent of those that
> follow it.
>
> (4) Minor optimization: You can avoid a template instantiation using
> std::atomic_bool for
> 1250 + std::atomic<bool> connect_done;
>
> (8) The library re-ordering appears to be pointless, or is there a
> reason?...
> benchmarks/frame-uniformity/CMakeLists.txt
> Can we revert all changes to that file?
>
> (9) Clients now start, but the wrapper that makes it possible feels
> inelegant...
> $ ls -a bin/
> mir_acceptance_tests
> .mir_acceptance_tests-uninstalled
> mir_demo_client_basic
> .mir_demo_client_basic-uninstalled
> mir_demo_client_cursors
> .mir_demo_client_cursors-uninstalled
> mir_demo_client_display_config
> .mir_demo_client_display_config-uninstalled
> mir_demo_client_eglcounter
> .mir_demo_client_eglcounter-uninstalled
> ...
> I suspect we can do better without needing a wrapper. But if we do
> use this then please don't hide binaries from developers:
> ".foo-uninstalled" should be "foo.bin"

I think we need one of (a) a wrapper, or (b) code in the libraries we
release solely there to negate the need for a trivial wrapper.

Choosing (b) introduces the possibility of otherwise-unnecessary code
having user-visible bugs, so I chose (a).

I hid the real binaries in the time-honoured tradition of libtool
(which uses wrapper scripts, and hides everything in a .libs/
directory). You've got a choice between developers going “why are
there all these *.bin that don't work when I try to run them lying
around in my build tree” and “why are there all these hidden
binaries lying around in my build tree”.

I think hidden files are less confusing. The (normal) directory listing
lists everything you should be running.

> (10) wrapper.c compiles to 10KB, but could be replaced with a trivial
> shell script instead.

Said shell script makes it more difficult to run gdb which is why I
switched to wrapper.c.

>
> (11) This is new on the end. What's it do?
> 1343 +} MIR_COMMON_3;

“MIR_COMMON_3.1 depends on MIR_COMMON_3”

[Chris Halse Rogers (raof)]

> (4) Minor optimization: You can avoid a template instantiation using
> std::atomic_bool for
> 1250 + std::atomic<bool> connect_done;

We already use std::atomic<bool> elsewhere, so this saves no template instatiations.

Also, std::atomic_bool is not the same as std::atomic<bool>. It's a vestigial attempt to match possibly C1y threading support.

[Andreas Pokorny (andreas-pokorny)]

looks good to me.

review: Approve

[Alan Griffiths (alan-griffiths)]

I'm not keen on the wrapper trick, but won't block when I don't have a better idea.

review: Approve

[Alan Griffiths (alan-griffiths)]

Text conflict in benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp
1 conflicts encountered.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2141
http://jenkins.qa.ubuntu.com/job/mir-ci/2346/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/427/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/343/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/427/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I still believe we could bend rpath* to our will and avoid wrappers. Although it's not impossible to figure that part out later and then drop the wrapper.

As for the minor cleanups, I still recommend resolving them. But I haven't revised this branch in detail. The end goal is rather important even if parts of the solution feel a bit ugly. I don't want to block it either.

review: Abstain

[Chris Halse Rogers (raof)]

I think I *have* resolved all your minor cleanups, with the exception
of replacing std::atomic<bool> with the non-equivalent std::atomic_bool.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2142
http://jenkins.qa.ubuntu.com/job/mir-ci/2354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/463
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/437/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/351/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/437/console

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

review: Abstain

[Robert Carr (robertcarr)]

LGTM. Happy we can still run gdb on the wrappers.

Surprised by the gtest matcher used outside of expectation setting at l1901

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2143
http://jenkins.qa.ubuntu.com/job/mir-ci/2369/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/478/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/478
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/452/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/366
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/452
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/452/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3655/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16542

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

Still need another merge with lp:mir it seems:
Text conflict in benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp
Text conflict in tests/acceptance-tests/CMakeLists.txt

review: Needs Fixing

[Andreas Pokorny (andreas-pokorny)]

I merged with the new changes on lp:mir and made tiny tweaks to share the SharedLibraryProberReport through mircommon..

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2144
http://jenkins.qa.ubuntu.com/job/mir-ci/2459/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/456
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/548
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3705
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16641

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2145
http://jenkins.qa.ubuntu.com/job/mir-ci/2462/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/577
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/577
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/459
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/551
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3707
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16648

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2146
http://jenkins.qa.ubuntu.com/job/mir-ci/2466/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/463
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/555
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3711
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16655

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

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

Still lgtm

review: Approve

[Chris Halse Rogers (raof)]

Still looks sensible to me

review: Approve

[Daniel van Vugt (vanvugt)]

(2) Spurious whitespace:
511 target_link_libraries(mirclient
512 +

(4) Minor optimization: You can avoid a template instantiation using std::atomic_bool for
1176 + std::atomic<bool> connect_done;

(9) I think we can do better than the wrapper approach. And I might do a proof of concept for rpath magic. It would be easier to get it in from the beginning than to have to unwind and remove all the wrapper stuff later.

[Andreas Pokorny (andreas-pokorny)]

> (9) I think we can do better than the wrapper approach. And I might do a proof
> of concept for rpath magic. It would be easier to get it in from the beginning
> than to have to unwind and remove all the wrapper stuff later.

I doubt rpath magic can that..

[Andreas Pokorny (andreas-pokorny)]

>
> > (9) I think we can do better than the wrapper approach. And I might do a
> proof
> > of concept for rpath magic. It would be easier to get it in from the
> beginning
> > than to have to unwind and remove all the wrapper stuff later.
>
> I doubt rpath magic can that..

I mean the wrapper solves knowing in which directory to search for platform modules to load and probe, while rpath solves finding a library through a (path-free) library file name - by adding more search paths.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2147
http://jenkins.qa.ubuntu.com/job/mir-ci/2500/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/624
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/598/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/497
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/497/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/598
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/598/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3749/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16703

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

[ FAILED ] 1 test, listed below:
[ FAILED ] TestClientInput.hidden_clients_do_not_receive_pointer_events

1 FAILED TEST
 YOU HAVE 8 DISABLED TESTS

not related to this change.

--

lgtm

review: Approve

[Alan Griffiths (alan-griffiths)]

40 +#include <iostream>
41 #include <assert.h>
42
43 namespace mt = mir::test;
44 @@ -45,7 +46,11 @@
45 mir_display_output_id_invalid};
46
47 auto surface = mir_connection_create_surface_sync(connection, &surface_params);
48 - assert(mir_surface_is_valid(surface));
49 + if (!mir_surface_is_valid(surface))
50 + {
51 + std::cerr << "Surface creation failed: " << mir_surface_get_error_message(surface) << std::endl;
52 + exit(1);
53 + }
54
55 return surface;
56 }
57 @@ -93,7 +98,11 @@
58 void TouchMeasuringClient::run(std::string const& connect_string)
59 {
60 auto connection = mir_connect_sync(connect_string.c_str(), "frame-uniformity-test");
61 - assert(mir_connection_is_valid(connection));
62 + if (!mir_connection_is_valid(connection))
63 + {
64 + std::cerr << "Connection to Mir failed: " << mir_connection_get_error_message(connection) << std::endl;
65 + exit(1);
66 + }

wouldn't "#undef NDEBUG" before including <cassert> be simpler and clearer?

[Alan Griffiths (alan-griffiths)]

995 === modified file 'src/client/mesa/client_platform_factory.h'

This file is /1/ effectively empty and /2/ isn't referenced. It can be removed. (Also the android counterpart)

review: Needs Fixing

[Chris Halse Rogers (raof)]

On Thu, Dec 18, 2014 at 11:46 PM, Alan Griffiths <email address hidden>
wrote:
> 40 +#include <iostream>
> 41 #include <assert.h>
> 42
> 43 namespace mt = mir::test;
> 44 @@ -45,7 +46,11 @@
> 45 mir_display_output_id_invalid};
> 46
> 47 auto surface = mir_connection_create_surface_sync(connection,
> &surface_params);
> 48 - assert(mir_surface_is_valid(surface));
> 49 + if (!mir_surface_is_valid(surface))
> 50 + {
> 51 + std::cerr << "Surface creation failed: " <<
> mir_surface_get_error_message(surface) << std::endl;
> 52 + exit(1);
> 53 + }
> 54
> 55 return surface;
> 56 }
> 57 @@ -93,7 +98,11 @@
> 58 void TouchMeasuringClient::run(std::string const& connect_string)
> 59 {
> 60 auto connection = mir_connect_sync(connect_string.c_str(),
> "frame-uniformity-test");
> 61 - assert(mir_connection_is_valid(connection));
> 62 + if (!mir_connection_is_valid(connection))
> 63 + {
> 64 + std::cerr << "Connection to Mir failed: " <<
> mir_connection_get_error_message(connection) << std::endl;
> 65 + exit(1);
> 66 + }
>
> wouldn't "#undef NDEBUG" before including <cassert> be simpler and
> clearer?

No, because that wouldn't print any diagnostics as to why the
connection/surface was invalid. I added those when debugging why the
frame_uniformity test was assert()ing :)

There might be an argument for having mir_assert_*_is_valid convenience
functions in the client library that do this, now that we've got client
library logging!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2148
http://jenkins.qa.ubuntu.com/job/mir-ci/2512/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/509
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/616
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3765
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16729

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Yes, rpath will have limitations. But there might be other alternatives to wrapping that are possible. Not sure yet, and I'm not blocking on the hypothesis.

[Alan Griffiths (alan-griffiths)]

OK. I still have some misgivings, but nothing to block on. And the changes are useful.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'benchmarks/frame-uniformity/main.cpp'
--- benchmarks/frame-uniformity/main.cpp	2014-10-26 02:13:36 +0000
+++ benchmarks/frame-uniformity/main.cpp	2014-12-18 22:43:30 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "frame_uniformity_test.h"
+#include "mir_test_framework/executable_path.h"
 
 #include <assert.h>
 #include <cmath>
@@ -27,6 +28,7 @@
 #include <gtest/gtest.h>
 
 namespace geom = mir::geometry;
+namespace mtf = mir_test_framework;
 
 namespace
 {
@@ -116,6 +118,11 @@
     int const run_count = 1;
     double average_lag = 0, average_uniformity = 0;
 
+    // Ensure we load the correct platform libraries
+    setenv("MIR_CLIENT_PLATFORM_PATH",
+           (mtf::library_path() + "/client-modules").c_str(),
+           true);
+    
     for (int i = 0; i < run_count; i++)
     {
         FrameUniformityTest t({screen_size, touch_start_point, touch_end_point, touch_duration});

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp'
--- benchmarks/frame-uniformity/touch_measuring_client.cpp	2014-10-26 02:13:36 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.cpp	2014-12-18 22:43:30 +0000
@@ -26,6 +26,7 @@
 #include <memory>
 #include <vector>
 
+#include <iostream>
 #include <assert.h>
 
 namespace mt = mir::test;
@@ -45,7 +46,11 @@
         mir_display_output_id_invalid};
     
     auto surface = mir_connection_create_surface_sync(connection, &surface_params);
-    assert(mir_surface_is_valid(surface));
+    if (!mir_surface_is_valid(surface))
+    {
+        std::cerr << "Surface creation failed: " << mir_surface_get_error_message(surface) << std::endl;
+        exit(1);
+    }
 
     return surface;
 }
@@ -93,7 +98,11 @@
 void TouchMeasuringClient::run(std::string const& connect_string)
 {
     auto connection = mir_connect_sync(connect_string.c_str(), "frame-uniformity-test");
-    assert(mir_connection_is_valid(connection));
+    if (!mir_connection_is_valid(connection))
+    {
+        std::cerr << "Connection to Mir failed: " << mir_connection_get_error_message(connection) << std::endl;
+        exit(1);
+    }
     
     /*
      * Set a null callback to avoid killing the process

=== modified file 'cmake/FindGtest.cmake'
--- cmake/FindGtest.cmake	2014-11-24 03:09:00 +0000
+++ cmake/FindGtest.cmake	2014-12-18 22:43:30 +0000
@@ -20,10 +20,9 @@
 set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
 set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
 
-set(GTEST_CMAKE_ARGS "")
+set(GTEST_CMAKE_ARGS "-DCMAKE_CXX_FLAGS=-fPIC")
 if (${CMAKE_CROSSCOMPILING})
-    set(GTEST_CMAKE_ARGS
-        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
+  list(APPEND GTEST_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
 endif()
 
 ExternalProject_Add(

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2014-12-08 04:03:47 +0000
+++ cmake/MirCommon.cmake	2014-12-18 22:43:30 +0000
@@ -168,3 +168,26 @@
     add_dependencies(${TARGET} ${TARGET}_pch)
   endif()
 endfunction()
+
+function (mir_add_wrapped_executable TARGET)
+  set(REAL_EXECUTABLE .${TARGET}-uninstalled)
+  add_executable(${TARGET} ${ARGN})
+  set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${REAL_EXECUTABLE})
+
+  add_executable(${TARGET}-wrapper ${PROJECT_SOURCE_DIR}/cmake/src/wrapper.c)
+  set_property(TARGET ${TARGET}-wrapper
+               APPEND_STRING PROPERTY COMPILE_FLAGS " -DEXECUTABLE=\\\"${REAL_EXECUTABLE}\\\"")
+  set_property(TARGET ${TARGET}-wrapper
+               APPEND_STRING PROPERTY COMPILE_FLAGS " -DBUILD_PREFIX=\\\"${CMAKE_BINARY_DIR}\\\"")
+  set_property(TARGET ${TARGET}-wrapper
+               APPEND_STRING PROPERTY COMPILE_FLAGS " -D_BSD_SOURCE")
+  set_property(TARGET ${TARGET}-wrapper
+	       PROPERTY OUTPUT_NAME ${TARGET})
+
+  add_dependencies(${TARGET} ${TARGET}-wrapper)
+  
+  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/${REAL_EXECUTABLE}
+          DESTINATION ${CMAKE_INSTALL_BINDIR}
+          RENAME ${TARGET}
+  )
+endfunction()

=== added file 'cmake/src/wrapper.c'
--- cmake/src/wrapper.c	1970-01-01 00:00:00 +0000
+++ cmake/src/wrapper.c	2014-12-18 22:43:30 +0000
@@ -0,0 +1,16 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <assert.h>
+
+int main(int argc, char** argv)
+{
+    assert(argc > 0);
+    setenv("MIR_CLIENT_PLATFORM_PATH", BUILD_PREFIX "/lib/client-modules/", 1);
+
+    argv[0] = BUILD_PREFIX "/bin/" EXECUTABLE;
+    execv(argv[0], argv);
+
+    perror("Failed to execute real binary " EXECUTABLE);
+    return 1;
+}

=== modified file 'debian/control'
--- debian/control	2014-12-08 04:03:47 +0000
+++ debian/control	2014-12-18 22:43:30 +0000
@@ -143,7 +143,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libmir${client-driver}-mesa | libmir${client-driver}-android,
+         mir-client-platform-mesa | mir-client-platform-android,
 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.
@@ -265,7 +265,7 @@
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
-Package: libmirclient8driver-mesa
+Package: mir-client-platform-mesa
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -279,7 +279,7 @@
  Contains the shared libraries required for the Mir clients to interact with
  the underlying hardware platform using the Mesa drivers.
 
-Package: libmirclient8driver-android
+Package: mir-client-platform-android
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -328,7 +328,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          libmir${platform-driver}-mesa,
-         libmir${client-driver}-mesa
+         mir-client-platform-mesa
 Description: Display server for Ubuntu - desktop driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -343,7 +343,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          libmir${platform-driver}-android,
-         libmir${client-driver}-android
+         mir-client-platform-android
 Description: Display server for Ubuntu - android driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.

=== modified file 'debian/create_postinst_prerm_scripts.sh'
--- debian/create_postinst_prerm_scripts.sh	2014-12-08 04:03:47 +0000
+++ debian/create_postinst_prerm_scripts.sh	2014-12-18 22:43:30 +0000
@@ -6,7 +6,7 @@
 deb_host_arch=$1
 deb_host_multiarch=$2
 
-mir_platform_types="${PLATFORM_DRIVER} ${CLIENT_DRIVER}"
+mir_platform_types="${PLATFORM_DRIVER}"
 case $deb_host_arch in
     arm64)
         mir_platforms="mesa"

=== renamed file 'debian/libmirclient8driver-android.install' => 'debian/mir-client-platform-android.install'
--- debian/libmirclient8driver-android.install	2014-12-08 04:03:47 +0000
+++ debian/mir-client-platform-android.install	2014-12-18 22:43:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client*driver/android/*
+usr/lib/*/mir/client-platform/android.so

=== renamed file 'debian/libmirclient8driver-mesa.install' => 'debian/mir-client-platform-mesa.install'
--- debian/libmirclient8driver-mesa.install	2014-12-08 04:03:47 +0000
+++ debian/mir-client-platform-mesa.install	2014-12-18 22:43:30 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client*driver/mesa/*
+usr/lib/*/mir/client-platform/mesa.so

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2014-12-08 04:03:47 +0000
+++ debian/mir-test-tools.install	2014-12-18 22:43:30 +0000
@@ -6,3 +6,4 @@
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so
 usr/lib/*/libmirplatformstub.so
+usr/lib/*/mir/client-platform/dummy.so

=== modified file 'debian/rules'
--- debian/rules	2014-12-08 04:03:47 +0000
+++ debian/rules	2014-12-18 22:43:30 +0000
@@ -14,7 +14,6 @@
 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
 export PLATFORM_DRIVER = platform5driver
-export CLIENT_DRIVER = client8driver
 
 %:
 	dh $@ --parallel --fail-missing
@@ -57,10 +56,9 @@
 # Nothing outside Mir should link to libmirprotobuf directly.
 # Delete the symlink so that --fail-missing doesn't think we've missed it
 # accidentally.
-	rm debian/tmp/usr/lib/*/libmirprotobuf.so
+	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
 	dh_install --fail-missing \
-	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(PLATFORM_DRIVER).so \
-	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(CLIENT_DRIVER).so
+	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(PLATFORM_DRIVER).so
 	sh debian/install_ld_so_conf.sh $(DEB_HOST_ARCH) $(DEB_HOST_MULTIARCH)
 
 override_dh_installdeb:
@@ -70,5 +68,4 @@
 
 override_dh_gencontrol:
 	dh_gencontrol -- \
-		-Vplatform-driver=$(PLATFORM_DRIVER) \
-		-Vclient-driver=$(CLIENT_DRIVER)
+		-Vplatform-driver=$(PLATFORM_DRIVER)

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2014-12-17 06:23:34 +0000
+++ examples/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -32,38 +32,38 @@
   ${EGL_LIBRARIES}
   ${GLESv2_LIBRARIES}
 )
-add_executable(mir_demo_client_eglflash
+mir_add_wrapped_executable(mir_demo_client_eglflash
   eglflash.c
 )
 target_link_libraries(mir_demo_client_eglflash
   eglapp
 )
-add_executable(mir_demo_client_egltriangle
+mir_add_wrapped_executable(mir_demo_client_egltriangle
   egltriangle.c
 )
 target_link_libraries(mir_demo_client_egltriangle
   eglapp
 )
-add_executable(mir_demo_client_eglcounter
+mir_add_wrapped_executable(mir_demo_client_eglcounter
   eglcounter.cpp
 )
 target_link_libraries(mir_demo_client_eglcounter
   eglapp
 )
-add_executable(mir_demo_client_eglplasma
+mir_add_wrapped_executable(mir_demo_client_eglplasma
   eglplasma.c
 )
 target_link_libraries(mir_demo_client_eglplasma
   eglapp
 )
-add_executable(mir_demo_client_cursors
+mir_add_wrapped_executable(mir_demo_client_cursors
   cursors_demo_client.c
 )
 target_link_libraries(mir_demo_client_cursors
   eglapp
 )
 
-add_executable(mir_demo_client_basic
+mir_add_wrapped_executable(mir_demo_client_basic
   basic.c
 )
 
@@ -75,22 +75,22 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-add_executable(mir_test_client_release_at_exit release_at_exit.c)
-target_link_libraries(mir_test_client_release_at_exit mirclient)
+mir_add_wrapped_executable(mir_demo_client_release_at_exit release_at_exit.c)
+target_link_libraries(mir_demo_client_release_at_exit mirclient)
 
-add_executable(mir_demo_client_multiwin multiwin.c)
+mir_add_wrapped_executable(mir_demo_client_multiwin multiwin.c)
 target_link_libraries(mir_demo_client_multiwin mirclient)
 
-add_executable(mir_demo_client_fingerpaint fingerpaint.c)
+mir_add_wrapped_executable(mir_demo_client_fingerpaint fingerpaint.c)
 target_link_libraries(mir_demo_client_fingerpaint mirclient)
 
-add_executable(mir_demo_client_progressbar progressbar.c)
+mir_add_wrapped_executable(mir_demo_client_progressbar progressbar.c)
 target_link_libraries(mir_demo_client_progressbar mirclient)
 
-add_executable(mir_demo_client_display_config demo_client_display_config.c)
+mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)
 target_link_libraries(mir_demo_client_display_config eglapp)
 
-add_executable(mir_demo_client_flicker
+mir_add_wrapped_executable(mir_demo_client_flicker
   flicker.c
 )
 
@@ -102,7 +102,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-add_executable(mir_demo_client_scroll
+mir_add_wrapped_executable(mir_demo_client_scroll
   scroll.cpp
 )
 
@@ -118,7 +118,7 @@
 
 )
 
-add_executable(mir_demo_client_prompt_session prompt_session.c)
+mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)
 target_link_libraries(mir_demo_client_prompt_session mirclient)
 
 add_library(mirdraw STATIC graphics_utils.cpp)
@@ -131,7 +131,7 @@
   ${GLESv2_INCLUDE_DIRS}
 )
 
-add_executable(mir_demo_standalone_render_to_fb
+mir_add_wrapped_executable(mir_demo_standalone_render_to_fb
     render_to_fb.cpp
 )
 
@@ -141,25 +141,7 @@
     ${Boost_LIBRARIES}
 )
 
-set (INSTALL_DEMOS
-  mir_demo_client_basic
-  mir_demo_client_flicker
-  mir_demo_client_scroll
-  mir_demo_client_eglflash
-  mir_demo_client_egltriangle
-  mir_demo_client_eglplasma
-  mir_demo_client_eglcounter
-  mir_demo_client_fingerpaint
-  mir_demo_client_multiwin
-  mir_demo_client_display_config
-  mir_demo_client_progressbar
-  mir_demo_client_prompt_session
-  mir_demo_standalone_render_to_fb
-)
-
-install(TARGETS ${INSTALL_DEMOS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-add_executable(mir_demo_server
+mir_add_wrapped_executable(mir_demo_server
   server_example.cpp
   glog_logger.cpp
 )
@@ -172,17 +154,10 @@
   ${Boost_LIBRARIES}
 )
 
-install(TARGETS mir_demo_server
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-add_executable(mir_demo_server_minimal server_minimal.cpp)
+mir_add_wrapped_executable(mir_demo_server_minimal server_minimal.cpp)
 target_link_libraries(mir_demo_server_minimal mirserver)
-install(TARGETS mir_demo_server_minimal
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
 
-add_executable(mir_demo_standalone_render_overlays
+mir_add_wrapped_executable(mir_demo_standalone_render_overlays
     render_overlays.cpp
 )
 
@@ -190,7 +165,3 @@
     mirserver
     mircommon
 )
-
-install(TARGETS mir_demo_standalone_render_overlays
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)

=== modified file 'playground/demo-shell/CMakeLists.txt'
--- playground/demo-shell/CMakeLists.txt	2014-12-17 02:32:08 +0000
+++ playground/demo-shell/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -4,7 +4,7 @@
   window_manager.cpp
 )
 
-add_executable(mir_proving_server
+mir_add_wrapped_executable(mir_proving_server
   demo_shell.cpp
 )
 
@@ -14,5 +14,3 @@
   playgroundserverconfig
   exampleserverconfig
 )
-
-install(TARGETS mir_proving_server RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-12-17 06:58:58 +0000
+++ src/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -34,3 +34,4 @@
 set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
 set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
 set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
+set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-12-15 06:24:03 +0000
+++ src/client/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -1,13 +1,3 @@
-set(MIRCLIENT_ABI 8)
-set(CLIENT_DRIVER client${MIRCLIENT_ABI}driver)
-set(MIR_CLIENT_DRIVER mir${CLIENT_DRIVER})
-set(MIR_CLIENT_DRIVER_BINARY lib${MIR_CLIENT_DRIVER}.so
-    CACHE STRING "File name of Mir client drivers")
-add_definitions(
-  -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
-  -DMIR_LOG_COMPONENT_FALLBACK="mirclient"
-)
-
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
@@ -33,6 +23,20 @@
   ${DRM_INCLUDE_DIRS}
 )
 
+set(MIRCLIENT_ABI 8)
+set(CLIENT_PLATFORM_VERSION "MIR_CLIENT_PLATFORM_2")
+set(symbol_map ${CMAKE_SOURCE_DIR}/src/client/symbols.map)
+
+set(MIR_CLIENT_PLATFORM_PATH
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/client-platform
+)
+set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
+
+add_definitions(-DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}/")
+add_definitions(-DCLIENT_PLATFORM_VERSION="${CLIENT_PLATFORM_VERSION}")
+add_definitions(-DMIR_LOGGING_COMPONENT_FALLBACK="mirclient")
+
+
 add_subdirectory(rpc/)
 add_subdirectory(lttng/)
 
@@ -72,20 +76,17 @@
   mir_prompt_session.cpp
   mir_prompt_session_api.cpp
   mir_event_distributor.cpp
+  probing_client_platform_factory.cpp
   periodic_perf_report.cpp
   mir_platform_message_api.cpp
 )
 
-add_library(
-  mirclient SHARED
+add_library(mirclient SHARED
 
   $<TARGET_OBJECTS:mirclientobjects>
 )
 
-set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
-
-set_target_properties(
-  mirclient
+set_target_properties(mirclient
 
   PROPERTIES
   SOVERSION ${MIRCLIENT_ABI}

=== modified file 'src/client/android/CMakeLists.txt'
--- src/client/android/CMakeLists.txt	2014-12-08 04:03:47 +0000
+++ src/client/android/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -14,17 +14,18 @@
 )
 
 add_library(
-  mirclientplatformandroid SHARED
-  
+  mirclientplatformandroid MODULE
+
   $<TARGET_OBJECTS:mirclientplatformandroidobjects>
   $<TARGET_OBJECTS:mirclient_platformimpl>
 )
 
 set_target_properties(
   mirclientplatformandroid PROPERTIES
-  OUTPUT_NAME ${MIR_CLIENT_DRIVER}
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/android
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+  OUTPUT_NAME android
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 
 target_link_libraries(mirclientplatformandroid
@@ -33,20 +34,4 @@
   ${LIBHARDWARE_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${CLIENT_DRIVER}/android)
-
-if (MIR_TEST_PLATFORM STREQUAL "android")
-  add_custom_command(TARGET mirclientplatformandroid
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_CLIENT_DRIVER_BINARY}
-    COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> ${MIR_CLIENT_DRIVER_BINARY}
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/${CLIENT_DRIVER}/android/${MIR_CLIENT_DRIVER_BINARY}
-       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-12-08 04:03:47 +0000
+++ src/client/android/android_native_display_container.cpp	2014-12-18 22:43:30 +0000
@@ -62,16 +62,24 @@
 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);
+
+    valid_displays.erase(display);
 }

=== 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-12-18 22:43:30 +0000
@@ -23,6 +23,9 @@
 
 #include "mir_toolkit/client_types.h"
 
+#include <unordered_set>
+#include <mutex>
+
 namespace mir
 {
 namespace client
@@ -36,14 +39,18 @@
     AndroidNativeDisplayContainer();
     virtual ~AndroidNativeDisplayContainer();
 
-    MirEGLNativeDisplayType create(MirConnection* connection);
-    void release(MirEGLNativeDisplayType display);
+    MirEGLNativeDisplayType create(ClientContext* context) override;
+    void release(MirEGLNativeDisplayType display) override;
 
-    bool validate(MirEGLNativeDisplayType display) const;
+    bool validate(MirEGLNativeDisplayType display) const override;
 
 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-12-18 22:43:30 +0000
@@ -16,19 +16,36 @@
  * 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 <boost/throw_exception.hpp>
+#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)
+    {
+        BOOST_THROW_EXCEPTION((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;
 }

=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * 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: Alexandros Frantzis <[e-mail]>
- */
-
-#ifndef MIR_CLIENT_ANDROID_CLIENT_PLATFORM_FACTORY_H_
-#define MIR_CLIENT_ANDROID_CLIENT_PLATFORM_FACTORY_H_
-
-#include "../client_platform_factory.h"
-
-namespace mir
-{
-namespace client
-{
-namespace android
-{
-
-class ClientPlatformFactory : public client::ClientPlatformFactory
-{
-public:
-    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
-};
-
-}
-}
-}
-
-#endif /* MIR_CLIENT_ANDROID_CLIENT_PLATFORM_FACTORY_H_ */

=== modified file 'src/client/android/symbols.map'
--- src/client/android/symbols.map	2014-12-08 04:03:47 +0000
+++ src/client/android/symbols.map	2014-12-18 22:43:30 +0000
@@ -1,5 +1,6 @@
-MIR_CLIENTPLATFORM_1 {
-  global: 
-    create_client_platform_factory;
+MIR_CLIENT_PLATFORM_2 {
+  global:
+    create_client_platform;
+    is_appropriate_module;
   local: *;
-};
\ No newline at end of file
+};

=== modified file 'src/client/client_context.h'
--- src/client/client_context.h	2013-08-28 03:41:48 +0000
+++ src/client/client_context.h	2014-12-18 22:43:30 +0000
@@ -19,6 +19,8 @@
 #ifndef MIR_CLIENT_CLIENT_CONTEXT_H_
 #define MIR_CLIENT_CLIENT_CONTEXT_H_
 
+#include "mir_toolkit/client_types.h"
+
 namespace mir
 {
 namespace client
@@ -29,7 +31,6 @@
 public:
     virtual ~ClientContext() {}
 
-    virtual MirConnection* mir_connection() = 0;
     virtual void populate(MirPlatformPackage& platform_package) = 0;
 
 protected:

=== 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-12-18 22:43:30 +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-12-08 04:03:47 +0000
+++ src/client/connection_configuration.h	2014-12-18 22:43:30 +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-12-08 04:03:47 +0000
+++ src/client/default_connection_configuration.cpp	2014-12-18 22:43:30 +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{MIR_CLIENT_DRIVER_BINARY};
+
+// 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;
         });
 }
 
@@ -219,15 +235,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-12-08 04:03:47 +0000
+++ src/client/default_connection_configuration.h	2014-12-18 22:43:30 +0000
@@ -60,16 +60,12 @@
     std::shared_ptr<EventSink> the_event_sink() override;
     std::shared_ptr<EventHandlerRegister> the_event_handler_register() override;
     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-12-18 22:43:30 +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-12-08 04:03:47 +0000
+++ src/client/mesa/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -15,7 +15,7 @@
 )
 
 add_library(
-  mirclientplatformmesa SHARED
+  mirclientplatformmesa MODULE
 
   $<TARGET_OBJECTS:mirclientplatformmesaobjects>
   $<TARGET_OBJECTS:mirclient_platformimpl>
@@ -23,9 +23,10 @@
 
 set_target_properties(
   mirclientplatformmesa PROPERTIES
-  OUTPUT_NAME ${MIR_CLIENT_DRIVER}
-  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
-  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
+  OUTPUT_NAME mesa
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 
 target_link_libraries(mirclientplatformmesa
@@ -33,21 +34,4 @@
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
 
-install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/${CLIENT_DRIVER}/mesa)
-
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
-  add_custom_command(TARGET mirclientplatformmesa
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E remove ${MIR_CLIENT_DRIVER_BINARY}
-    COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> ${MIR_CLIENT_DRIVER_BINARY}
-    WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-  )
-
-  install(CODE
-    "execute_process(
-       COMMAND ln -sf mir/${CLIENT_DRIVER}/mesa/${MIR_CLIENT_DRIVER_BINARY}
-       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-12-18 22:43:30 +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-12-18 22:43:30 +0000
@@ -16,13 +16,17 @@
  * 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>
+#include <boost/throw_exception.hpp>
 
 namespace mcl = mir::client;
 namespace mclm = mcl::mesa;
@@ -57,15 +61,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)
+    {
+        BOOST_THROW_EXCEPTION((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;
 }

=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * 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: Alexandros Frantzis <[e-mail]>
- */
-
-#ifndef MIR_CLIENT_MESA_CLIENT_PLATFORM_FACTORY_H_
-#define MIR_CLIENT_MESA_CLIENT_PLATFORM_FACTORY_H_
-
-#include "../client_platform_factory.h"
-
-namespace mir
-{
-namespace client
-{
-namespace mesa
-{
-
-class ClientPlatformFactory : public client::ClientPlatformFactory
-{
-public:
-    std::shared_ptr<ClientPlatform> create_client_platform(ClientContext* context) override;
-};
-
-}
-}
-}
-
-#endif /* MIR_CLIENT_MESA_CLIENT_PLATFORM_FACTORY_H_ */

=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
--- src/client/mesa/mesa_native_display_container.cpp	2014-12-08 04:03:47 +0000
+++ src/client/mesa/mesa_native_display_container.cpp	2014-12-18 22:43:30 +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-12-18 22:43:30 +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-12-08 04:03:47 +0000
+++ src/client/mesa/native_surface.cpp	2014-12-18 22:43:30 +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-12-08 04:03:47 +0000
+++ src/client/mesa/symbols.map	2014-12-18 22:43:30 +0000
@@ -1,7 +1,9 @@
-MIR_CLIENTPLATFORM_1 {
-  global: 
-    create_client_platform_factory;
+MIR_CLIENT_PLATFORM_2 {
+  global:
+    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-12-15 06:24:03 +0000
+++ src/client/mir_connection.cpp	2014-12-18 22:43:30 +0000
@@ -96,11 +96,11 @@
 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),
         debug(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()),
@@ -236,6 +236,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
@@ -420,9 +423,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();
 
@@ -478,11 +481,6 @@
     return platform;
 }
 
-MirConnection* MirConnection::mir_connection()
-{
-    return this;
-}
-
 EGLNativeDisplayType MirConnection::egl_native_display()
 {
     std::lock_guard<decltype(mutex)> lock(mutex);

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2014-12-15 06:24:03 +0000
+++ src/client/mir_connection.h	2014-12-18 22:43:30 +0000
@@ -22,6 +22,7 @@
 #include <memory>
 #include <unordered_set>
 #include <unordered_map>
+#include <atomic>
 
 #include <mutex>
 
@@ -122,8 +123,6 @@
 
     static bool is_valid(MirConnection *connection);
 
-    MirConnection* mir_connection();
-
     EGLNativeDisplayType egl_native_display();
 
     void on_surface_created(int id, MirSurface* surface);
@@ -158,6 +157,7 @@
     std::shared_ptr<mir::logging::Logger> const logger;
     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-12-18 22:43:30 +0000
@@ -0,0 +1,38 @@
+#include "probing_client_platform_factory.h"
+
+#include <boost/exception/all.hpp>
+#include <stdexcept>
+
+namespace mcl = mir::client;
+
+mcl::ProbingClientPlatformFactory::ProbingClientPlatformFactory(std::vector<std::shared_ptr<mir::SharedLibrary>> const& modules)
+    : platform_modules{modules}
+{
+    if (modules.empty())
+    {
+        BOOST_THROW_EXCEPTION(
+            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?
+        }
+    }
+    BOOST_THROW_EXCEPTION(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-12-18 22:43:30 +0000
@@ -0,0 +1,26 @@
+#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/symbols.map'
--- src/common/symbols.map	2014-12-17 02:32:08 +0000
+++ src/common/symbols.map	2014-12-18 22:43:30 +0000
@@ -203,15 +203,15 @@
 };
 
 MIR_COMMON_3.1 {
- global:
-  extern "C++" {
-    mir_event_get*;
-    mir_event_get*;
-    mir_input_event_get*;
-    mir_key_input_event_get*;
-    mir::log*char*;
-    mir::logv*;
-    mir_touch_input_event_get*;
-  };
-};
-
+  global:
+    extern "C++" {
+      mir_event_get*;
+      mir_event_get*;
+      mir_input_event_get*;
+      mir_key_input_event_get*;
+      mir_touch_input_event_get*;
+      mir::log*char*;
+      mir::logv*;
+      mir::libraries_for_path*;
+    };
+} MIR_COMMON_3;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-12-08 04:03:47 +0000
+++ tests/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -26,9 +26,17 @@
 endif()
 
 if (MIR_TEST_PLATFORM STREQUAL "android")
+  add_definitions(-DANDROID)
+endif()
+
+if (MIR_BUILD_PLATFORM_ANDROID)
   #avoid complaints about poor quality android headers
   include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
-  add_definitions(-DANDROID)
+  add_definitions(-DMIR_BUILD_PLATFORM_ANDROID)
+endif()
+
+if (MIR_BUILD_PLATFORM_MESA)
+  add_definitions(-DMIR_BUILD_PLATFORM_MESA)
 endif()
 
 include_directories(

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-12-15 06:24:03 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -6,7 +6,6 @@
 
 add_definitions(
   -DMIR_PLATFORM_DRIVER_BINARY="${MIR_PLATFORM_DRIVER_BINARY}"
-  -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
 )
 
 set(
@@ -48,7 +47,7 @@
 
 add_subdirectory(throwback)
 
-add_executable(
+mir_add_wrapped_executable(
   mir_acceptance_tests
 
   ${SOURCES}
@@ -68,9 +67,9 @@
   mirplatform
 
   mir-test
-  mir-test-framework
   mir-test-doubles
   mir-test-doubles-platform
+  mir-test-framework
   3rd_party
 
   ${PROTOBUF_LIBRARIES}
@@ -91,8 +90,3 @@
 if (MIR_RUN_ACCEPTANCE_TESTS)
   mir_discover_tests(mir_acceptance_tests)
 endif (MIR_RUN_ACCEPTANCE_TESTS)
-
-install(
-    TARGETS mir_acceptance_tests
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2014-12-12 01:03:15 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2014-12-18 22:43:30 +0000
@@ -20,6 +20,7 @@
 
 #include "mir_test_framework/headless_in_process_server.h"
 #include "mir_test_framework/using_stub_client_platform.h"
+#include "mir_test_framework/stub_platform_helpers.h"
 #include "mir_test/validity_matchers.h"
 
 #include "src/client/client_buffer.h"
@@ -546,15 +547,14 @@
 
 TEST_F(ClientLibrary, accesses_platform_package)
 {
+    using namespace testing;
     mir_wait_for(mir_connect(new_connection().c_str(), __PRETTY_FUNCTION__, connection_callback, this));
 
     MirPlatformPackage platform_package;
-    platform_package.data_items = -1;
-    platform_package.fd_items = -1;
+    ::memset(&platform_package, -1, sizeof(platform_package));
 
     mir_connection_get_platform(connection, &platform_package);
-    EXPECT_GE(0, platform_package.data_items);
-    EXPECT_GE(0, platform_package.fd_items);
+    EXPECT_THAT(platform_package, mtf::IsStubPlatformPackage());
 
     mir_connection_release(connection);
 }

=== modified file 'tests/acceptance-tests/test_client_library_drm.cpp'
--- tests/acceptance-tests/test_client_library_drm.cpp	2014-12-08 04:03:47 +0000
+++ tests/acceptance-tests/test_client_library_drm.cpp	2014-12-18 22:43:30 +0000
@@ -32,10 +32,15 @@
 {
     struct gbm_device* dev = reinterpret_cast<struct gbm_device*>(connection);
 
+    MirPlatformPackage pkg;
+
+    mir_connection_get_platform(connection, &pkg);
+    int const previous_data_count{pkg.data_items};
+
     mir_connection_drm_set_gbm_device(connection, dev);
+    mir_connection_get_platform(connection, &pkg);
 
-    MirPlatformPackage pkg;
-    mir_connection_get_platform(connection, &pkg);
-    EXPECT_THAT(pkg.data_items, Eq(sizeof(dev) / sizeof(int)));
-    EXPECT_THAT(*reinterpret_cast<struct gbm_device**>(&pkg.data[0]), Eq(dev));
+    EXPECT_THAT(pkg.data_items, Eq(previous_data_count + (sizeof(dev) / sizeof(int))));
+    EXPECT_THAT(reinterpret_cast<struct gbm_device*>(pkg.data[previous_data_count]),
+                Eq(dev));
 }

=== modified file 'tests/acceptance-tests/test_symbols_required_by_mesa.cpp'
--- tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-12-08 04:03:47 +0000
+++ tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2014-12-18 22:43:30 +0000
@@ -21,11 +21,14 @@
 
 #include <dlfcn.h>
 
+#include "mir_test_framework/executable_path.h"
+
 using namespace testing;
+namespace mtf = mir_test_framework;
 
-TEST(SymbolsRequiredByMesa, are_exported_by_libmirclientplatform)
+TEST(SymbolsRequiredByMesa, are_exported_by_client_platform_mesa)
 {
-    auto const handle = dlopen(MIR_CLIENT_DRIVER_BINARY, RTLD_LAZY);
+    auto const handle = dlopen((mtf::library_path() + "/client-modules/mesa.so").c_str(), RTLD_LAZY);
     ASSERT_THAT(handle, NotNull());
 
     auto const sym = dlsym(handle, "mir_client_mesa_egl_native_display_is_valid");

=== modified file 'tests/include/mir_test_doubles/mock_client_context.h'
--- tests/include/mir_test_doubles/mock_client_context.h	2013-04-24 05:22:20 +0000
+++ tests/include/mir_test_doubles/mock_client_context.h	2014-12-18 22:43:30 +0000
@@ -33,18 +33,12 @@
 struct MockClientContext : public client::ClientContext
 {
     MockClientContext()
-        : connection{reinterpret_cast<MirConnection*>(0xabcdef)}
     {
         using namespace testing;
 
-        ON_CALL(*this, mir_connection()).WillByDefault(Return(connection));
-        EXPECT_CALL(*this, mir_connection()).Times(AtLeast(0));
         EXPECT_CALL(*this, populate(_)).Times(AtLeast(0));
     }
 
-    MirConnection* connection;
-
-    MOCK_METHOD0(mir_connection, MirConnection*());
     MOCK_METHOD1(populate, void(MirPlatformPackage&));
 };
 

=== modified file 'tests/include/mir_test_doubles/stub_client_buffer.h'
--- tests/include/mir_test_doubles/stub_client_buffer.h	2014-11-24 16:04:38 +0000
+++ tests/include/mir_test_doubles/stub_client_buffer.h	2014-12-18 22:43:30 +0000
@@ -65,7 +65,11 @@
 
     std::shared_ptr<graphics::NativeBuffer> native_buffer_handle() const override
     {
+#ifndef ANDROID
+        return package;
+#else
         return std::shared_ptr<graphics::NativeBuffer>();
+#endif
     }
     void update_from(MirBufferPackage const&) override {}
     void fill_update_msg(MirBufferPackage&)  override{}

=== 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-12-18 22:43:30 +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-modules/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-modules/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_

=== 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-12-18 22:43:30 +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_ */

=== added file 'tests/include/mir_test_framework/stub_platform_helpers.h'
--- tests/include/mir_test_framework/stub_platform_helpers.h	1970-01-01 00:00:00 +0000
+++ tests/include/mir_test_framework/stub_platform_helpers.h	2014-12-18 22:43:30 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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_PLATFORM_HELPERS_H_
+#define MIR_TEST_FRAMEWORK_STUB_PLATFORM_HELPERS_H_
+
+#include "mir/graphics/platform_ipc_package.h"
+#include "mir_toolkit/client_types.h"
+
+#include <gmock/gmock.h>
+
+namespace mir_test_framework
+{
+constexpr int stub_data_size{21};
+constexpr int stub_data_guard{0x0eadbeef};
+
+static inline void pack_stub_ipc_package(mir::graphics::PlatformIPCPackage& package)
+{
+    package.ipc_data = std::vector<int32_t>(stub_data_size, -1);
+    package.ipc_data[0] = stub_data_guard;
+}
+
+static inline void create_stub_platform_package(MirPlatformPackage& package)
+{
+    ::memset(&package, 0, sizeof(package));
+    package.data_items = stub_data_size;
+    package.data[0] = stub_data_guard;
+}
+
+MATCHER(IsStubPlatformPackage, "")
+{
+    return (arg.data_items == stub_data_size) &&
+           (arg.data[0] == stub_data_guard) &&
+           (arg.fd_items == 0);
+}
+}
+
+#endif // MIR_TEST_FRAMEWORK_STUB_PLATFORM_HELPERS_H_

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-12-08 04:03:47 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -66,7 +66,7 @@
 endif()
 
 link_directories(${LIBRARY_OUTPUT_PATH})
-add_executable(
+mir_add_wrapped_executable(
   mir_integration_tests
   ${INTEGRATION_TESTS_SRCS}
   ${MIR_SERVER_OBJECTS}
@@ -126,8 +126,3 @@
 if (MIR_RUN_INTEGRATION_TESTS)
   mir_discover_tests(mir_integration_tests)
 endif (MIR_RUN_INTEGRATION_TESTS)
-
-install(
-    TARGETS mir_integration_tests
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)

=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt	2014-12-08 04:03:47 +0000
+++ tests/mir_test_doubles/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -30,13 +30,14 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gl.cpp
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "mesa")
+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
 )
-elseif (MIR_TEST_PLATFORM STREQUAL "android")
+endif()
+if (MIR_BUILD_PLATFORM_ANDROID)
 list(APPEND MIR_TEST_DOUBLES_PLATFORM_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_android_hw.cpp
 )

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2014-12-18 07:07:22 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -4,10 +4,11 @@
   ${PROJECT_SOURCE_DIR}/src/include/common
   ${PROJECT_SOURCE_DIR}/src/include/server
   ${PROJECT_SOURCE_DIR}/src/include/client
-    ${Boost_INCLUDE_DIRS}
-    ${GLESv2_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}
-    ${UMOCKDEV_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+  ${GLESv2_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}
+  ${UMOCKDEV_INCLUDE_DIRS}
+  ${ANDROID_HEADERS_INCLUDE_DIRS}
 )
 
 set(
@@ -32,6 +33,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
@@ -69,6 +71,29 @@
   ${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_LDFLAGS} ${UMOCKDEV_LIBRARIES}
+)
+
+set_target_properties(
+  mirclientplatformstub PROPERTIES;
+  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
+  OUTPUT_NAME dummy
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${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
@@ -97,3 +122,4 @@
 )
 
 install(TARGETS mirplatformstub LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS mirclientplatformstub LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})

=== 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-12-18 22:43:30 +0000
@@ -0,0 +1,74 @@
+/*
+ * 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 "mir_test_doubles/stub_client_buffer_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 mtd = mir::test::doubles;
+
+namespace
+{
+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<mtd::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-12-18 22:43:30 +0000
@@ -0,0 +1,41 @@
+/*
+ * 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 "src/client/client_context.h"
+
+#include "mir_test_framework/stub_client_platform_factory.h"
+#include "mir_test_framework/stub_platform_helpers.h"
+#include <memory>
+#include <gmock/gmock.h>
+
+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)
+{
+    using namespace testing;
+    MirPlatformPackage package;
+    context->populate(package);
+    return Matches(mtf::IsStubPlatformPackage())(package);
+}

=== modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
--- tests/mir_test_framework/stubbed_graphics_platform.cpp	2014-12-15 06:24:03 +0000
+++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2014-12-18 22:43:30 +0000
@@ -22,6 +22,8 @@
 #include "mir/graphics/buffer_ipc_message.h"
 #include "mir/graphics/buffer_writer.h"
 
+#include "mir_test_framework/stub_platform_helpers.h"
+
 #include "mir_test_doubles/stub_buffer_allocator.h"
 #include "mir_test_doubles/stub_display.h"
 #include "mir/fd.h"
@@ -149,7 +151,9 @@
 
     std::shared_ptr<mg::PlatformIPCPackage> connection_ipc_package() override
     {
-        return std::make_shared<mg::PlatformIPCPackage>();
+        auto package = std::make_shared<mg::PlatformIPCPackage>();
+        mtf::pack_stub_ipc_package(*package);
+        return package;
     }
 
     mg::PlatformOperationMessage platform_operation(

=== 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-12-18 22:43:30 +0000
@@ -0,0 +1,7 @@
+MIR_CLIENT_PLATFORM_2 {
+  global: 
+    create_client_platform;
+    is_appropriate_module;
+  local:
+    *;
+};

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-12-08 04:03:47 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -56,7 +56,7 @@
 
 link_directories(${LIBRARY_OUTPUT_PATH})
 
-add_executable(mir_unit_tests 
+mir_add_wrapped_executable(mir_unit_tests
   ${UNIT_TEST_SOURCES}
   ${MIR_SERVER_OBJECTS}
   $<TARGET_OBJECTS:mirclientobjects>
@@ -117,11 +117,6 @@
   mir_discover_tests(mir_unit_tests LD_PRELOAD=libumockdev-preload.so.0 G_SLICE=always-malloc G_DEBUG=gc-friendly)
 endif (MIR_RUN_UNIT_TESTS)
 
-install(
-    TARGETS mir_unit_tests
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
 add_custom_command(TARGET mir_unit_tests POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
   ${CMAKE_CURRENT_SOURCE_DIR}/test_data ${CMAKE_BINARY_DIR}/bin/test_data

=== modified file 'tests/unit-tests/client/CMakeLists.txt'
--- tests/unit-tests/client/CMakeLists.txt	2014-12-08 04:03:47 +0000
+++ tests/unit-tests/client/CMakeLists.txt	2014-12-18 22:43:30 +0000
@@ -10,6 +10,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_client_display_conf.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_mir_screencast.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_rpc_channel.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_probing_client_platform_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_mir_prompt_session.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_event_distributor.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_periodic_perf_report.cpp

=== 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-12-18 22:43:30 +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-12-18 22:43:30 +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-12-18 22:43:30 +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-12-18 22:43:30 +0000
@@ -20,60 +20,153 @@
 #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"
+#include "mir_test_framework/stub_platform_helpers.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-modules/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-modules/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
+
+ClientPlatformTraits const dummy_platform{"/client-modules/dummy.so",
+                                          [](MirPlatformPackage& pkg)
+                                          {
+                                              mtf::create_stub_platform_package(pkg);
+                                          },
+                                          mir_platform_type_gbm
+                                         };
+
+INSTANTIATE_TEST_CASE_P(Dummy,
+                        ClientPlatformTest,
+                        ::testing::Values(&dummy_platform));
+}
+
+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 = mir_platform_package_max + 1;
+                                  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-12-18 22:43:30 +0000
@@ -0,0 +1,142 @@
+/*
+ * 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 "mir_test_framework/stub_platform_helpers.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-modules/mesa.so"));
+#endif
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/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)
+#else
+TEST(ProbingClientPlatformFactory, DISABLED_CreatesMesaPlatformWhenAppropriate)
+#endif
+{
+    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());
+}
+
+#ifdef MIR_BUILD_PLATFORM_ANDROID
+TEST(ProbingClientPlatformFactory, CreatesAndroidPlatformWhenAppropriate)
+#else
+TEST(ProbingClientPlatformFactory, DISABLED_CreatesAndroidPlatformWhenAppropriate)
+#endif
+{
+    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());
+}
+
+TEST(ProbingClientPlatformFactory, IgnoresNonClientPlatformModules)
+{
+    using namespace testing;
+
+    auto modules = all_available_modules();
+    // NOTE: For minimum fuss, load something that has minimal side-effects...
+    modules.push_back(std::make_shared<mir::SharedLibrary>("libc.so.6"));
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() + "/client-modules/dummy.so"));
+
+    mir::client::ProbingClientPlatformFactory factory{modules};
+
+    mtd::MockClientContext context;
+    ON_CALL(context, populate(_))
+            .WillByDefault(Invoke([](MirPlatformPackage& pkg)
+                           {
+                               mtf::create_stub_platform_package(pkg);
+                           }));
+
+    auto platform = factory.create_client_platform(&context);
+}

=== modified file 'tests/unit-tests/shared_library_test.cpp'
--- tests/unit-tests/shared_library_test.cpp	2014-12-08 04:03:47 +0000
+++ tests/unit-tests/shared_library_test.cpp	2014-12-18 22:43:30 +0000
@@ -59,10 +59,10 @@
 public:
     SharedLibrary()
         : nonexistent_library{"imma_totally_not_a_library"},
-          existing_library{mtf::library_path() + "/" MIR_CLIENT_DRIVER_BINARY},
+          existing_library{mtf::library_path() + "/client-modules/mesa.so"},
           nonexistent_function{"yo_dawg"},
-          existing_function{"create_client_platform_factory"},
-          existent_version{"MIR_CLIENTPLATFORM_1"},
+          existing_function{"create_client_platform"},
+          existent_version{"MIR_CLIENT_PLATFORM_2"},
           nonexistent_version{"GOATS_ON_THE_GREEN"}
     {
     }