Merge lp:~raof/mir/shared-library-prober into lp:mir

[Chris Halse Rogers]

Add a helper to load all the shared libraries in a directory.

While this isn't used yet, it's obviously useful for probing a directory containing platform plugins, which is the follow-on branch.

Start of broken-out privatise-all-the-things.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1871
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2547/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1517/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1523/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1500/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1069/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/437/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1872
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2548/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1518/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1524/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1501/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1070/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/438/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1873
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2551/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1529
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1073
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1073/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/443
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2583
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12337

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

923 + EXPECT_TRUE(amd64_failed || armhf_failed);

How come an i386 system can load the amd64 library (it seems to work in the CI tests)? What about arm64, which is one of the architectures we build packages for?

Nits:

37 +mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report)
638 +{

Perhaps some white space in this function would aid readability.

TEST_F(SharedLibraryProber, ReturnsNonEmptyListForPathContainingLibraries)

I know this (i.e., PascalCase) is supposed to be the right way to name things with GTest but it is a pain to read (IMO, may just be a matter of getting used to it).

review: Needs Information

[Chris Halse Rogers (raof)]

> 923 + EXPECT_TRUE(amd64_failed || armhf_failed);
>
> How come an i386 system can load the amd64 library (it seems to work in the CI
> tests)? What about arm64, which is one of the architectures we build packages
> for?

And i386 system can't load the amd64 library. But that's fine - for an i386 system (or an arm64 system, or powerpc, or whatever) *both* amd64_failed and armhf_failed will be true. That's not XOR :)

Unless ld.linux gains the ability to load armhf libraries into an x86-64 process or visa versa, at least one of the loads is guaranteed to fail, which means we'll be testing what we want.

>
> Nits:
>
> 37 +mir::libraries_for_path(std::string const& path,
> mir::SharedLibraryProberReport& report)
> 638 +{
>
> Perhaps some white space in this function would aid readability.

Done.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1874
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2566/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1531
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1088/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/468
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/468/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2607
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12453

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK, the CI failure seems unrelated.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

406 +class SharedLibraryProberReport : public mir::SharedLibraryProberReport

- would be good if the two weren't named exactly the same (makes searching difficult, may confuse some IDEs).

Approved otherwise.

Also, libboost-filesystem-dev had recently been eliminated, now we are reintroducing (which I'm okay with.. just saying).

review: Needs Fixing

[Chris Halse Rogers (raof)]

FWIW, SharedLibraryProberReport is consistent with the rest of the mcl::lttng::*Reports - RpcReport, InputReceiverReport, ClientTracepointProvider.

Would you like me to rename all of them, or none of them? :)

[Cemil Azizoglu (cemil-azizoglu)]

None of them is fine by me.

review: Approve

[Daniel van Vugt (vanvugt)]

boost is a giant bloated thing we should be minimizing the use of. I'd much rather see some nice simple dirent logic instead of reintroducing boost::filesystem.

review: Needs Fixing

[Chris Halse Rogers (raof)]

I believe that boost::filesystem is standardised in C++14 as the
<filesystem> header (but sadly not yet in our compiler chain), at which
point we basically just drop the boost:: prefix.

Lots of boost is weird and freaky; boost::filesystem isn't really.

[Alexandros Frantzis (afrantzis)]

> I believe that boost::filesystem is standardised in C++14

Unfortunately not, it's just a Technical Specification at the moment. It will hopefully be merged into the next major C++ release (C++17?). Compilers are free to implement the TSs under the std::experimental namespace, but I don't think libstdc++ has any support for it at the moment.

[Kevin DuBois (kdub)]

#1
789: binary_path()
I had to use this functionality last month in a different test, so I split out mtf::executable_path(). We should reuse that.

#2
My concern about using boost filesystem is more that it increases the touch image size... However it seems to already be there so I don't mind using it.

'preapproving', pending fixing #1

review: Approve

[Chris Halse Rogers (raof)]

#1
Hah! And I extend mtf::executable_path() in the follow up branch. I clearly didn't pull it back when splitting this out though. Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1875
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2617/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1613/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1619
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1595/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/532/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1876
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2619/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1621
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1597
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1141/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/534
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/534/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2659
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12708

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1876
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2628/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1630
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1606/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1150
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/543
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/543/artifact/work/output/*zip*/output.zip
    ABORTED: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2664/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12729

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

CI was aborted so unrelated.

Looks good to me.

Nit:

837 + // /usr is guaranteed to exist, and shouldn't contain any libraries

Would be nice if there was an expectation or assertion to test that assumption, or perhaps create a temp directory under /tmp?

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1877
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2641/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1647
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1623/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/560/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1878
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2647/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1169
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/567
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2686
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12846

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Daniel: are you still blocking over boost-filesystem? I mean, I can implement a subset std::experimental::filesystem using dirent if you really want... :)

[Daniel van Vugt (vanvugt)]

It's a minor regression in terms of bloat and portability. But I know when I've been outvoted. Top-approving despite my disapproval on principle.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-05 03:37:19 +0000
+++ CMakeLists.txt	2014-09-08 04:22:15 +0000
@@ -107,7 +107,7 @@
 include_directories(include/common include.private/common)
 
 # Check for boost
-find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams REQUIRED)
+find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams filesystem REQUIRED)
 include_directories (
   ${Boost_INCLUDE_DIRS}
 )

=== modified file 'debian/control'
--- debian/control	2014-09-05 03:37:19 +0000
+++ debian/control	2014-09-08 04:22:15 +0000
@@ -19,6 +19,7 @@
                libboost-program-options-dev,
                libboost-system-dev,
                libboost-iostreams-dev,
+               libboost-filesystem-dev,
                protobuf-compiler,
                libdrm-dev,
                libegl1-mesa-dev,

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

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

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

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

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2014-09-05 03:37:19 +0000
+++ src/client/default_connection_configuration.cpp	2014-09-08 04:22:15 +0000
@@ -26,13 +26,17 @@
 #include "mir/input/null_input_receiver_report.h"
 #include "logging/rpc_report.h"
 #include "logging/input_receiver_report.h"
+#include "mir/logging/shared_library_prober_report.h"
+#include "mir/logging/null_shared_library_prober_report.h"
 #include "lttng/rpc_report.h"
 #include "lttng/input_receiver_report.h"
+#include "lttng/shared_library_prober_report.h"
 #include "connection_surface_map.h"
 #include "lifecycle_control.h"
 #include "mir/shared_library.h"
 #include "client_platform_factory.h"
 #include "mir_event_distributor.h"
+#include "mir/shared_library_prober.h"
 
 #include <dlfcn.h>
 
@@ -197,6 +201,22 @@
         });
 }
 
+std::shared_ptr<mir::SharedLibraryProberReport> mir::client::DefaultConnectionConfiguration::the_shared_library_prober_report()
+{
+    return shared_library_prober_report(
+        [this] () -> std::shared_ptr<mir::SharedLibraryProberReport>
+        {
+            auto val_raw = getenv("MIR_CLIENT_SHARED_LIBRARY_PROBER_REPORT");
+            std::string const val{val_raw ? val_raw : off_opt_val};
+            if (val == log_opt_val)
+                return std::make_shared<mir::logging::SharedLibraryProberReport>(the_logger());
+            else if (val == lttng_opt_val)
+                return std::make_shared<mcl::lttng::SharedLibraryProberReport>();
+            else
+                return std::make_shared<mir::logging::NullSharedLibraryProberReport>();
+        });
+}
+
 std::shared_ptr<mir::SharedLibrary> mcl::DefaultConnectionConfiguration::the_platform_library()
 {
     if (!platform_library)
@@ -206,6 +226,5 @@
         std::string const libname{val_raw ? val_raw : default_platform_lib};
         platform_library = std::make_shared<mir::SharedLibrary>(libname);
     }
-
     return platform_library;
 }

=== modified file 'src/client/default_connection_configuration.h'
--- src/client/default_connection_configuration.h	2014-09-05 03:37:19 +0000
+++ src/client/default_connection_configuration.h	2014-09-08 04:22:15 +0000
@@ -27,6 +27,8 @@
 
 namespace mir
 {
+class SharedLibraryProberReport;
+
 namespace input
 {
 namespace receiver
@@ -57,6 +59,7 @@
     std::shared_ptr<LifecycleControl> the_lifecycle_control();
     std::shared_ptr<EventSink> the_event_sink();
     std::shared_ptr<EventHandlerRegister> the_event_handler_register();
+    std::shared_ptr<mir::SharedLibraryProberReport> the_shared_library_prober_report();
     std::shared_ptr<SharedLibrary> the_platform_library() override;
 
     virtual std::string the_socket_file();
@@ -78,6 +81,7 @@
 
     CachedPtr<rpc::RpcReport> rpc_report;
     CachedPtr<input::receiver::InputReceiverReport> input_receiver_report;
+    CachedPtr<mir::SharedLibraryProberReport>  shared_library_prober_report;
 
 private:
     std::string const socket_file;

=== modified file 'src/client/lttng/CMakeLists.txt'
--- src/client/lttng/CMakeLists.txt	2014-09-05 03:37:19 +0000
+++ src/client/lttng/CMakeLists.txt	2014-09-08 04:22:15 +0000
@@ -6,6 +6,7 @@
   client_tracepoint_provider.cpp
   rpc_report.cpp
   input_receiver_report.cpp
+  shared_library_prober_report.cpp
 )
 
 add_library(mirclientlttng SHARED tracepoints.c)

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

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

=== added file 'src/client/lttng/shared_library_prober_report_tp.h'
--- src/client/lttng/shared_library_prober_report_tp.h	1970-01-01 00:00:00 +0000
+++ src/client/lttng/shared_library_prober_report_tp.h	2014-09-08 04:22:15 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER mir_client_shared_library_prober
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./shared_library_prober_report_tp.h"
+
+#if !defined(MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_
+
+#include <lttng/tracepoint.h>
+#include <stdint.h>
+
+#ifdef __clang__
+/*
+ * TRACEPOINT_EVENT defines functions; since we disable tracepoints under clang
+ * these functions are unused and so generate fatal warnings.
+ * (see mir_tracepoint.h and http://sourceware.org/bugzilla/show_bug.cgi?id=13974)
+ */
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wunused-function"
+#endif
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    probing_path,
+    TP_ARGS(const char*, path),
+    TP_FIELDS(
+        ctf_string(path, path)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    probing_failed,
+    TP_ARGS(const char*, path, const char*, message),
+    TP_FIELDS(
+        ctf_string(path, path)
+        ctf_string(message, message)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    loading_library,
+    TP_ARGS(const char*, path),
+    TP_FIELDS(
+        ctf_string(path, path)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_client_shared_library_prober,
+    loading_failed,
+    TP_ARGS(const char*, path, const char*, message),
+    TP_FIELDS(
+        ctf_string(path, path)
+        ctf_string(message, message)
+    )
+)
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif /* MIR_CLIENT_LTTNG_SHARED_LIBRARY_PROBER_REPORT_TP_H_ */
+
+#include <lttng/tracepoint-event.h>

=== modified file 'src/common/logging/CMakeLists.txt'
--- src/common/logging/CMakeLists.txt	2014-09-05 03:37:19 +0000
+++ src/common/logging/CMakeLists.txt	2014-09-08 04:22:15 +0000
@@ -17,6 +17,7 @@
 add_library(mirsharedlogging OBJECT
   dumb_console_logger.cpp
   input_timestamp.cpp
+  shared_library_prober_report.cpp
 )
 
 list(APPEND MIR_COMMON_SOURCES

=== added file 'src/common/logging/shared_library_prober_report.cpp'
--- src/common/logging/shared_library_prober_report.cpp	1970-01-01 00:00:00 +0000
+++ src/common/logging/shared_library_prober_report.cpp	2014-09-08 04:22:15 +0000
@@ -0,0 +1,58 @@
+
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir/logging/shared_library_prober_report.h"
+#include "mir/logging/logger.h"
+
+namespace ml = mir::logging;
+
+ml::SharedLibraryProberReport::SharedLibraryProberReport(std::shared_ptr<Logger> const& logger)
+    : logger{logger}
+{
+}
+
+void ml::SharedLibraryProberReport::probing_path(boost::filesystem::path const& path)
+{
+    logger->log(ml::Logger::Severity::informational,
+                std::string("Loading modules from: ") + path.string(),
+                "Loader");
+}
+
+void ml::SharedLibraryProberReport::probing_failed(boost::filesystem::path const& path, std::exception const& error)
+{
+    logger->log(ml::Logger::Severity::error,
+                std::string("Failed to load libraries from path: ") + path.string() +
+                " (error was:" + error.what() + ")",
+                "Loader");
+}
+
+void ml::SharedLibraryProberReport::loading_library(boost::filesystem::path const& filename)
+{
+    logger->log(ml::Logger::Severity::informational,
+                std::string("Loading module: ") + filename.string(),
+                "Loader");
+}
+
+void ml::SharedLibraryProberReport::loading_failed(boost::filesystem::path const& filename, std::exception const& error)
+{
+    logger->log(ml::Logger::Severity::warning,
+                std::string("Failed to load module: ") + filename.string() +
+                " (error was:" + error.what() + ")",
+                "Loader");
+}

=== modified file 'src/common/sharedlibrary/CMakeLists.txt'
--- src/common/sharedlibrary/CMakeLists.txt	2014-09-05 03:37:19 +0000
+++ src/common/sharedlibrary/CMakeLists.txt	2014-09-08 04:22:15 +0000
@@ -16,6 +16,7 @@
 
 add_library(mirsharedsharedlibrary OBJECT
   shared_library.cpp
+  shared_library_prober.cpp
 )
 
 list(APPEND MIR_COMMON_SOURCES

=== added file 'src/common/sharedlibrary/shared_library_prober.cpp'
--- src/common/sharedlibrary/shared_library_prober.cpp	1970-01-01 00:00:00 +0000
+++ src/common/sharedlibrary/shared_library_prober.cpp	2014-09-08 04:22:15 +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 Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "mir/shared_library_prober.h"
+#include "mir/shared_library.h"
+
+#include <system_error>
+#include <boost/filesystem.hpp>
+
+namespace
+{
+std::error_code boost_to_std_error(boost::system::error_code const& ec)
+{
+    if (ec)
+    {
+        if (ec.category() != boost::system::system_category())
+        {
+            throw std::logic_error{"Boost error from unexpected category: " +
+                                   ec.message()};
+        }
+        return std::error_code{ec.value(), std::system_category()};
+    }
+    return std::error_code{};
+}
+}
+
+std::vector<std::shared_ptr<mir::SharedLibrary>>
+mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report)
+{
+    report.probing_path(path);
+    // We use the error_code overload because we want to throw a std::system_error
+    boost::system::error_code ec;
+
+    boost::filesystem::directory_iterator iterator{path, ec};
+    if (ec)
+    {
+        std::system_error error{boost_to_std_error(ec)};
+        report.probing_failed(path, error);
+        throw error;
+    }
+
+    std::vector<std::shared_ptr<mir::SharedLibrary>> libraries;
+    for (; iterator != boost::filesystem::directory_iterator() ; ++iterator)
+    {
+        if (iterator->path().extension().string() == ".so")
+        {
+            try
+            {
+                report.loading_library(iterator->path());
+                libraries.emplace_back(std::make_shared<mir::SharedLibrary>(iterator->path().string()));
+            }
+            catch (std::runtime_error const& err)
+            {
+                report.loading_failed(iterator->path(), err);
+            }
+        }
+    }
+    return libraries;
+}

=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2014-09-05 06:22:08 +0000
+++ src/common/symbols.map	2014-09-08 04:22:15 +0000
@@ -130,12 +130,19 @@
     mir::input::receiver::XKBMapper::update_state_and_map_event*;
     mir::input::receiver::XKBMapper::?XKBMapper*;
     mir::input::receiver::XKBMapper::XKBMapper*;
+    mir::libraries_for_path*;
     mir::logging::DumbConsoleLogger::log*;
     mir::logging::input_timestamp*;
     mir::logging::Logger::log*;
     mir::logging::Logger::?Logger*;
     mir::logging::Logger::Logger*;
     mir::logging::Logger::operator*;
+    mir::logging::SharedLibraryProberReport::?SharedLibraryProberReport*;
+    mir::logging::SharedLibraryProberReport::SharedLibraryProberReport*;
+    mir::logging::SharedLibraryProberReport::probing_path*;
+    mir::logging::SharedLibraryProberReport::probing_failed*;
+    mir::logging::SharedLibraryProberReport::loading_library*;
+    mir::logging::SharedLibraryProberReport::loading_failed*;
     mir_omnidirectional_resize_cursor_name*;
     mir_open_hand_cursor_name*;
     mir_pointing_hand_cursor_name*;
@@ -807,6 +814,7 @@
     typeinfo?for?MirKeyEvent;
     typeinfo?for?mir::logging::DumbConsoleLogger;
     typeinfo?for?mir::logging::Logger;
+    typeinfo?for?mir::logging::SharedLibraryProberReport;
     typeinfo?for?MirMesaEGLNativeDisplay;
     typeinfo?for?MirMesaEGLNativeSurface;
     typeinfo?for?MirMotionEvent;
@@ -899,6 +907,7 @@
     vtable?for?MirKeyEvent;
     vtable?for?mir::logging::DumbConsoleLogger;
     vtable?for?mir::logging::Logger;
+    vtable?for?mir::logging::SharedLibraryProberReport;
     vtable?for?MirMesaEGLNativeDisplay;
     vtable?for?MirMesaEGLNativeSurface;
     vtable?for?MirMotionEvent;

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-09-05 03:37:19 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-09-08 04:22:15 +0000
@@ -21,6 +21,7 @@
   test_basic_observers.cpp
   test_fatal.cpp
   test_fd.cpp
+  test_shared_library_prober.cpp
 )
 
 add_subdirectory(options/)
@@ -106,3 +107,9 @@
     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
+  COMMENT "Copying test data to build dir..."
+)

=== added directory 'tests/unit-tests/test_data'
=== added file 'tests/unit-tests/test_data/libamd64.so'
Binary files tests/unit-tests/test_data/libamd64.so	1970-01-01 00:00:00 +0000 and tests/unit-tests/test_data/libamd64.so	2014-09-08 04:22:15 +0000 differ
=== added file 'tests/unit-tests/test_data/libarmhf.so'
Binary files tests/unit-tests/test_data/libarmhf.so	1970-01-01 00:00:00 +0000 and tests/unit-tests/test_data/libarmhf.so	2014-09-08 04:22:15 +0000 differ
=== added file 'tests/unit-tests/test_shared_library_prober.cpp'
--- tests/unit-tests/test_shared_library_prober.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/test_shared_library_prober.cpp	2014-09-08 04:22:15 +0000
@@ -0,0 +1,182 @@
+/*
+ * 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/shared_library_prober.h"
+
+#include "mir_test_framework/executable_path.h"
+
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <cstring>
+
+#include <system_error>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace mtf = mir_test_framework;
+
+namespace
+{
+class MockSharedLibraryProberReport : public mir::SharedLibraryProberReport
+{
+public:
+    MOCK_METHOD1(probing_path, void(boost::filesystem::path const&));
+    MOCK_METHOD2(probing_failed, void(boost::filesystem::path const&, std::exception const&));
+    MOCK_METHOD1(loading_library, void(boost::filesystem::path const&));
+    MOCK_METHOD2(loading_failed, void(boost::filesystem::path const&, std::exception const&));
+};
+
+class SharedLibraryProber : public testing::Test
+{
+public:
+    SharedLibraryProber()
+        : library_path{mtf::executable_path() + "/test_data"}
+    {
+        // Can't use std::string, as mkdtemp mutates its argument.
+        auto tmp_name = std::unique_ptr<char[], std::function<void(char*)>>{strdup("/tmp/mir_empty_directory_XXXXXX"),
+                                                                            [](char* data) {free(data);}};
+        if (mkdtemp(tmp_name.get()) == NULL)
+        {
+            throw std::system_error{errno, std::system_category(), "Failed to create temporary directory"};
+        }
+        temporary_directory = std::string{tmp_name.get()};
+    }
+
+    ~SharedLibraryProber()
+    {
+        // Can't do anything useful in case of failure...
+        rmdir(temporary_directory.c_str());
+    }
+
+    std::string const library_path;
+    std::string temporary_directory;
+    testing::NiceMock<MockSharedLibraryProberReport> null_report;
+};
+
+}
+
+TEST_F(SharedLibraryProber, ReturnsNonEmptyListForPathContainingLibraries)
+{
+    auto libraries = mir::libraries_for_path(library_path, null_report);
+    EXPECT_GE(libraries.size(), 1);
+}
+
+TEST_F(SharedLibraryProber, RaisesExceptionForNonexistentPath)
+{
+    EXPECT_THROW(mir::libraries_for_path("/a/path/that/certainly/doesnt/exist", null_report),
+                 std::system_error);
+}
+
+TEST_F(SharedLibraryProber, NonExistentPathRaisesENOENTError)
+{
+    try
+    {
+        mir::libraries_for_path("/a/path/that/certainly/doesnt/exist", null_report);
+    }
+    catch (std::system_error &err)
+    {
+        EXPECT_EQ(err.code(), std::error_code(ENOENT, std::system_category()));
+    }
+}
+
+TEST_F(SharedLibraryProber, PathWithNoSharedLibrariesReturnsEmptyList)
+{
+    auto libraries = mir::libraries_for_path(temporary_directory.c_str(), null_report);
+    EXPECT_EQ(0, libraries.size());
+}
+
+TEST_F(SharedLibraryProber, LogsStartOfProbe)
+{
+    using namespace testing;
+    testing::NiceMock<MockSharedLibraryProberReport> report;
+
+    EXPECT_CALL(report, probing_path(testing::Eq(library_path)));
+
+    mir::libraries_for_path(library_path, report);
+}
+
+TEST_F(SharedLibraryProber, LogsForNonexistentPath)
+{
+    using namespace testing;
+    NiceMock<MockSharedLibraryProberReport> report;
+
+    EXPECT_CALL(report, probing_path(testing::Eq("/yo/dawg/I/heard/you/liked/slashes")));
+
+    EXPECT_THROW(mir::libraries_for_path("/yo/dawg/I/heard/you/liked/slashes", report),
+                 std::runtime_error);
+}
+
+TEST_F(SharedLibraryProber, LogsFailureForNonexistentPath)
+{
+    using namespace testing;
+    NiceMock<MockSharedLibraryProberReport> report;
+
+    EXPECT_CALL(report, probing_failed(Eq("/yo/dawg/I/heard/you/liked/slashes"), _));
+
+    EXPECT_THROW(mir::libraries_for_path("/yo/dawg/I/heard/you/liked/slashes", report),
+                 std::runtime_error);
+
+}
+
+TEST_F(SharedLibraryProber, LogsNoLibrariesForPathWithoutLibraries)
+{
+    using namespace testing;
+    NiceMock<MockSharedLibraryProberReport> report;
+
+    EXPECT_CALL(report, loading_library(_)).Times(0);
+
+    mir::libraries_for_path(temporary_directory.c_str(), report);
+}
+
+namespace
+{
+MATCHER_P(FilenameMatches, path, "")
+{
+    *result_listener << "where the path is " << arg;
+    return boost::filesystem::path(path).filename() == arg.filename();
+}
+}
+
+TEST_F(SharedLibraryProber, LogsEachLibraryProbed)
+{
+    using namespace testing;
+    NiceMock<MockSharedLibraryProberReport> report;
+
+    EXPECT_CALL(report, loading_library(FilenameMatches("libamd64.so")));
+    EXPECT_CALL(report, loading_library(FilenameMatches("libarmhf.so")));
+
+    mir::libraries_for_path(library_path, report);
+}
+
+TEST_F(SharedLibraryProber, LogsFailureForLoadFailure)
+{
+    using namespace testing;
+    NiceMock<MockSharedLibraryProberReport> report;
+
+    bool armhf_failed{false}, amd64_failed{false};
+
+    ON_CALL(report, loading_failed(FilenameMatches("libamd64.so"), _))
+            .WillByDefault(InvokeWithoutArgs([&amd64_failed]() { amd64_failed = true; }));
+    ON_CALL(report, loading_failed(FilenameMatches("libarmhf.so"), _))
+            .WillByDefault(InvokeWithoutArgs([&armhf_failed]() { armhf_failed = true; }));
+
+    mir::libraries_for_path(library_path, report);
+
+    EXPECT_TRUE(amd64_failed || armhf_failed);
+}