Merge lp:~afrantzis/mir/versioned-platform-libraries-plus-server-abi-bump into lp:mir

[Alexandros Frantzis]

platforms: Use the ABI version in platform library names and packages + server ABI bump for testing CI

platforms: Use the ABI version in platform library names and packages + server ABI bump for testing CI

[lp:~afrantzis/mir/versioned-platform-libraries-plus-server-abi-bump]

2334. By Alexandros Frantzis on 2015-02-20

Bump CI

Unmerged revisions

2334. By Alexandros Frantzis on 2015-02-20

Bump CI

2333. By Alexandros Frantzis on 2015-02-20

Bump mirserver ABI to 30

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-19 13:21:15 +0000
+++ CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -27,7 +27,7 @@
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 12) # This should change at least with every MIRSERVER_ABI
+set(MIR_VERSION_MINOR 13) # This should change at least with every MIRSERVER_ABI
 set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})

=== modified file 'debian/control'
--- debian/control	2015-02-19 10:37:47 +0000
+++ debian/control	2015-02-20 12:45:33 +0000
@@ -61,7 +61,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver29
+Package: libmirserver30
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -127,7 +127,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver29 (= ${binary:Version}),
+Depends: libmirserver30 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -266,7 +266,7 @@
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
-Package: mir-platform-graphics-mesa
+Package: mir-platform-graphics-mesa2
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -280,7 +280,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
-Package: mir-platform-graphics-android
+Package: mir-platform-graphics-android2
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -294,7 +294,7 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Android drivers.
 
-Package: mir-client-platform-mesa
+Package: mir-client-platform-mesa2
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -323,7 +323,7 @@
  Contains header files required to use the platform specific capabilities of
  the Mir Mesa backend.
 
-Package: mir-client-platform-android
+Package: mir-client-platform-android2
 Section: libs
 Architecture: i386 amd64 armhf
 Multi-Arch: same
@@ -343,8 +343,8 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-mesa,
-         mir-client-platform-mesa,
+         mir-platform-graphics-mesa2,
+         mir-client-platform-mesa2,
 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.
@@ -358,8 +358,8 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-android,
-         mir-client-platform-android,
+         mir-platform-graphics-android2,
+         mir-client-platform-android2,
 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.

=== renamed file 'debian/libmirserver29.install' => 'debian/libmirserver30.install'
--- debian/libmirserver29.install	2015-02-19 10:37:47 +0000
+++ debian/libmirserver30.install	2015-02-20 12:45:33 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.29
+usr/lib/*/libmirserver.so.30

=== renamed file 'debian/mir-client-platform-android.install' => 'debian/mir-client-platform-android2.install'
--- debian/mir-client-platform-android.install	2015-01-21 07:34:50 +0000
+++ debian/mir-client-platform-android2.install	2015-02-20 12:45:33 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client-platform/android.so
+usr/lib/*/mir/client-platform/android.so.2

=== renamed file 'debian/mir-client-platform-mesa.install' => 'debian/mir-client-platform-mesa2.install'
--- debian/mir-client-platform-mesa.install	2015-01-21 07:34:50 +0000
+++ debian/mir-client-platform-mesa2.install	2015-02-20 12:45:33 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/client-platform/mesa.so
+usr/lib/*/mir/client-platform/mesa.so.2

=== renamed file 'debian/mir-platform-graphics-android.install' => 'debian/mir-platform-graphics-android2.install'
--- debian/mir-platform-graphics-android.install	2015-01-14 13:09:48 +0000
+++ debian/mir-platform-graphics-android2.install	2015-02-20 12:45:33 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-android.so
+usr/lib/*/mir/server-platform/graphics-android.so.2

=== renamed file 'debian/mir-platform-graphics-mesa.install' => 'debian/mir-platform-graphics-mesa2.install'
--- debian/mir-platform-graphics-mesa.install	2015-01-14 13:09:48 +0000
+++ debian/mir-platform-graphics-mesa2.install	2015-02-20 12:45:33 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/mir/server-platform/graphics-mesa.so
+usr/lib/*/mir/server-platform/graphics-mesa.so.2

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-02-18 03:04:18 +0000
+++ src/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -1,5 +1,4 @@
-# We need MIRPLATFORM_ABI and MIR_PLATFORM_DRIVER_BINARY in both libmirplatform 
-# and the platform implementations.
+# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
 set(MIRPLATFORM_ABI 7)
 
 # We need MIR_CLIENT_PLATFORM_PATH in both libmirclient and the platform
@@ -42,3 +41,7 @@
 set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
 set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
 set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
+
+# We need the ABI versions in the tests
+set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
+set(MIR_CLIENT_PLATFORM_ABI ${MIR_CLIENT_PLATFORM_ABI} PARENT_SCOPE)

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2015-02-13 06:12:34 +0000
+++ src/client/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -24,11 +24,10 @@
 )
 
 set(MIRCLIENT_ABI 8)
-set(CLIENT_PLATFORM_VERSION "MIR_CLIENT_PLATFORM_2")
 set(symbol_map ${CMAKE_SOURCE_DIR}/src/client/symbols.map)
 
 add_definitions(-DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}/")
-add_definitions(-DCLIENT_PLATFORM_VERSION="${CLIENT_PLATFORM_VERSION}")
+add_definitions(-DCLIENT_PLATFORM_VERSION="${MIR_CLIENT_PLATFORM_VERSION}")
 add_definitions(-DMIR_LOGGING_COMPONENT_FALLBACK="mirclient")
 
 add_subdirectory(rpc/)

=== modified file 'src/common/sharedlibrary/shared_library_prober.cpp'
--- src/common/sharedlibrary/shared_library_prober.cpp	2014-09-02 00:28:47 +0000
+++ src/common/sharedlibrary/shared_library_prober.cpp	2015-02-20 12:45:33 +0000
@@ -37,6 +37,14 @@
     }
     return std::error_code{};
 }
+
+// Libraries can be of the form libname.so(.X.Y)
+bool path_has_library_extension(boost::filesystem::path const& path)
+{
+    return path.extension().string() == ".so" ||
+           path.string().find(".so.") != std::string::npos;
+}
+
 }
 
 std::vector<std::shared_ptr<mir::SharedLibrary>>
@@ -57,7 +65,7 @@
     std::vector<std::shared_ptr<mir::SharedLibrary>> libraries;
     for (; iterator != boost::filesystem::directory_iterator() ; ++iterator)
     {
-        if (iterator->path().extension().string() == ".so")
+        if (path_has_library_extension(iterator->path()))
         {
             try
             {

=== modified file 'src/platform/graphics/platform_probe.cpp'
--- src/platform/graphics/platform_probe.cpp	2014-12-17 13:48:10 +0000
+++ src/platform/graphics/platform_probe.cpp	2015-02-20 12:45:33 +0000
@@ -47,7 +47,7 @@
         {
             // Tried to probe a SharedLibrary that isn't a platform module?
             ml::log(ml::Severity::warning,
-                    std::string{"Failed to probe module. Not a platform library? Error: "} + err.what(),
+                    std::string{"Failed to probe module. Not a platform library or incorrect ABI version? Error: "} + err.what(),
                     "Platform Probing");
         }
     }

=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt	2015-02-18 03:04:18 +0000
+++ src/platforms/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -3,7 +3,9 @@
 # This ABI is much smaller than the full libmirplatform ABI.
 #
 # TODO: Add an extra driver-ABI check target.
-set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_2")
+set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 2)
+set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
+set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_${MIR_SERVER_GRAPHICS_PLATFORM_ABI}")
 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)
 
 set(MIR_SERVER_PLATFORM_PATH
@@ -14,6 +16,11 @@
   PARENT_SCOPE
 )
 
+set(MIR_CLIENT_PLATFORM_ABI 2)
+set(MIR_CLIENT_PLATFORM_ABI ${MIR_CLIENT_PLATFORM_ABI} PARENT_SCOPE)
+set(MIR_CLIENT_PLATFORM_VERSION "MIR_CLIENT_PLATFORM_${MIR_CLIENT_PLATFORM_ABI}")
+set(MIR_CLIENT_PLATFORM_VERSION ${MIR_CLIENT_PLATFORM_VERSION} PARENT_SCOPE)
+
 set(server_common_include_dirs
   ${PROJECT_SOURCE_DIR}/include/platform
 )

=== modified file 'src/platforms/android/client/CMakeLists.txt'
--- src/platforms/android/client/CMakeLists.txt	2015-02-13 06:12:34 +0000
+++ src/platforms/android/client/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -26,6 +26,7 @@
   OUTPUT_NAME android
   LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
   PREFIX ""
+  SUFFIX ".so.${MIR_CLIENT_PLATFORM_ABI}"
   LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 

=== modified file 'src/platforms/android/server/CMakeLists.txt'
--- src/platforms/android/server/CMakeLists.txt	2015-02-13 06:12:34 +0000
+++ src/platforms/android/server/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -63,6 +63,7 @@
   OUTPUT_NAME graphics-android
   LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
   PREFIX ""
+  SUFFIX ".so.${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 

=== modified file 'src/platforms/mesa/client/CMakeLists.txt'
--- src/platforms/mesa/client/CMakeLists.txt	2015-01-22 09:00:14 +0000
+++ src/platforms/mesa/client/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -28,6 +28,7 @@
   OUTPUT_NAME mesa
   LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
   PREFIX ""
+  SUFFIX ".so.${MIR_CLIENT_PLATFORM_ABI}"
   LINK_FLAGS "-Wl,--version-script,${symbol_map}"
 )
 

=== modified file 'src/platforms/mesa/server/CMakeLists.txt'
--- src/platforms/mesa/server/CMakeLists.txt	2015-02-13 06:12:34 +0000
+++ src/platforms/mesa/server/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -64,6 +64,7 @@
   OUTPUT_NAME graphics-mesa
   LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/server-modules
   PREFIX ""
+  SUFFIX ".so.${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 )
 

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2015-02-19 13:21:15 +0000
+++ src/server/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -106,7 +106,7 @@
   ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
 )
 
-set(MIRSERVER_ABI 29) # Be sure to increment MIR_VERSION_MINOR at the same time
+set(MIRSERVER_ABI 30) # Be sure to increment MIR_VERSION_MINOR at the same time
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(

=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2015-02-19 10:43:31 +0000
+++ src/server/symbols.map	2015-02-20 12:45:33 +0000
@@ -1,4 +1,4 @@
-MIR_SERVER_29 {
+MIR_SERVER_30 {
  global:
   extern "C++" {
 # Symbols not yet picked up by script
@@ -226,6 +226,7 @@
     mir::scene::SurfaceCoordinator::operator*;
     mir::scene::SurfaceCoordinator::raise*;
     mir::scene::SurfaceCoordinator::remove_surface*;
+    mir::scene::SurfaceCoordinator::surface_at*;
     mir::scene::SurfaceCoordinator::?SurfaceCoordinator*;
     mir::scene::SurfaceCoordinator::SurfaceCoordinator*;
     mir::scene::SurfaceCreationParameters::of_buffer_usage*;
@@ -735,9 +736,3 @@
   };
  local: *;
 };
-
-MIR_SERVER_29.1 {
-  global:
-    mir::scene::SurfaceCoordinator::surface_at*;
-  local: *;
-} MIR_SERVER_29;

=== modified file 'tests/acceptance-tests/test_symbols_required_by_mesa.cpp'
--- tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2015-02-13 06:12:34 +0000
+++ tests/acceptance-tests/test_symbols_required_by_mesa.cpp	2015-02-20 12:45:33 +0000
@@ -28,7 +28,7 @@
 
 TEST(SymbolsRequiredByMesa, are_exported_by_client_platform_mesa)
 {
-    auto const handle = dlopen(mtf::client_platform("mesa.so").c_str(), RTLD_LAZY);
+    auto const handle = dlopen(mtf::client_platform("mesa").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_framework/client_platform_factory.h'
--- tests/include/mir_test_framework/client_platform_factory.h	2015-02-13 06:12:34 +0000
+++ tests/include/mir_test_framework/client_platform_factory.h	2015-02-20 12:45:33 +0000
@@ -37,7 +37,7 @@
     mtd::MockClientContext ctx;
     ON_CALL(ctx, populate_server_package(_))
         .WillByDefault(Invoke([](MirPlatformPackage& package) { ::memset(&package, 0, sizeof(package)); }));
-    platform_library = std::make_shared<mir::SharedLibrary>(client_platform("android.so"));
+    platform_library = std::make_shared<mir::SharedLibrary>(client_platform("android"));
     auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
     return platform_factory(&ctx);
 }
@@ -46,7 +46,7 @@
     mir::client::ClientContext* client_context)
 {
     using namespace testing;
-    platform_library = std::make_shared<mir::SharedLibrary>(client_platform("mesa.so"));
+    platform_library = std::make_shared<mir::SharedLibrary>(client_platform("mesa"));
     auto platform_factory = platform_library->load_function<mir::client::CreateClientPlatform>("create_client_platform");
     return platform_factory(client_context);
 }

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2015-02-13 06:12:34 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2015-02-20 12:45:33 +0000
@@ -14,6 +14,8 @@
 add_definitions(
     -DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}"
     -DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}"
+    -DMIR_CLIENT_PLATFORM_ABI_STRING="${MIR_CLIENT_PLATFORM_ABI}"
+    -DMIR_SERVER_GRAPHICS_PLATFORM_ABI_STRING="${MIR_SERVER_GRAPHICS_PLATFORM_ABI}"
     )
 
 set(

=== modified file 'tests/mir_test_framework/executable_path.cpp'
--- tests/mir_test_framework/executable_path.cpp	2015-02-13 06:12:34 +0000
+++ tests/mir_test_framework/executable_path.cpp	2015-02-20 12:45:33 +0000
@@ -47,10 +47,15 @@
 
 std::string mir_test_framework::server_platform(std::string const& name)
 {
+    std::string libname{name};
+
+    if (libname.find(".so") == std::string::npos)
+        libname += ".so." MIR_SERVER_GRAPHICS_PLATFORM_ABI_STRING;
+
     for (auto const& option :
          {library_path() + "/server-modules/", library_path() + "/server-platform/", std::string(MIR_SERVER_PLATFORM_PATH) + '/'})
     {
-        auto path_to_test = option + name;
+        auto path_to_test = option + libname;
         if (boost::filesystem::exists(path_to_test))
             return path_to_test;
     }
@@ -60,10 +65,15 @@
 
 std::string mir_test_framework::client_platform(std::string const& name)
 {
+    std::string libname{name};
+
+    if (libname.find(".so") == std::string::npos)
+        libname += ".so." MIR_CLIENT_PLATFORM_ABI_STRING;
+
     for (auto const& option :
          {library_path() + "/client-modules/", library_path() + "/client-platform/", std::string(MIR_CLIENT_PLATFORM_PATH) + '/'})
     {
-        auto path_to_test = option + name;
+        auto path_to_test = option + libname;
         if (boost::filesystem::exists(path_to_test))
             return path_to_test;
     }

=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
--- tests/unit-tests/client/test_client_platform.cpp	2015-02-13 06:12:34 +0000
+++ tests/unit-tests/client/test_client_platform.cpp	2015-02-20 12:45:33 +0000
@@ -79,7 +79,7 @@
 };
 
 #ifdef MIR_BUILD_PLATFORM_ANDROID
-ClientPlatformTraits const android_platform{"android.so",
+ClientPlatformTraits const android_platform{"android",
                                             [](MirPlatformPackage& pkg)
                                             {
                                                 ::memset(&pkg, 0, sizeof(pkg));
@@ -94,7 +94,7 @@
 #endif
 
 #ifdef MIR_BUILD_PLATFORM_MESA
-ClientPlatformTraits const mesa_platform{"mesa.so",
+ClientPlatformTraits const mesa_platform{"mesa",
                                          [](MirPlatformPackage& pkg)
                                          {
                                              ::memset(&pkg, 0, sizeof(pkg));

=== modified file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp'
--- tests/unit-tests/client/test_probing_client_platform_factory.cpp	2015-02-13 06:12:34 +0000
+++ tests/unit-tests/client/test_probing_client_platform_factory.cpp	2015-02-20 12:45:33 +0000
@@ -36,10 +36,10 @@
 {
     std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
 #ifdef MIR_BUILD_PLATFORM_MESA
-    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("mesa.so")));
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("mesa")));
 #endif
 #ifdef MIR_BUILD_PLATFORM_ANDROID
-    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("android.so")));
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::client_platform("android")));
 #endif
     return modules;
 }

=== modified file 'tests/unit-tests/graphics/android/test_platform.cpp'
--- tests/unit-tests/graphics/android/test_platform.cpp	2015-02-13 06:12:34 +0000
+++ tests/unit-tests/graphics/android/test_platform.cpp	2015-02-20 12:45:33 +0000
@@ -239,7 +239,7 @@
 
     ON_CALL(hwaccess, hw_get_module(_,_)).WillByDefault(Return(-1));
 
-    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-android.so")};
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-android")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
     EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
 }
@@ -248,7 +248,7 @@
 {
     testing::NiceMock<mtd::HardwareAccessMock> hwaccess;
 
-    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-android.so")};
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-android")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
     EXPECT_EQ(mg::PlatformPriority::best, probe());
 }

=== modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_platform.cpp	2015-02-13 06:12:34 +0000
+++ tests/unit-tests/graphics/mesa/test_platform.cpp	2015-02-20 12:45:33 +0000
@@ -304,7 +304,7 @@
 {
     mtf::UdevEnvironment udev_environment;
 
-    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa.so")};
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
     EXPECT_EQ(mg::PlatformPriority::unsupported, probe());
 }
@@ -315,7 +315,7 @@
 
     udev_environment.add_standard_device("standard-drm-devices");
 
-    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa.so")};
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
     EXPECT_EQ(mg::PlatformPriority::best, probe());
 }

=== modified file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	2014-12-17 19:59:21 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2015-02-20 12:45:33 +0000
@@ -47,10 +47,10 @@
     std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
 
 #ifdef MIR_BUILD_PLATFORM_MESA
-    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-mesa.so")));
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-mesa")));
 #endif
 #ifdef MIR_BUILD_PLATFORM_ANDROID
-    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-android.so")));
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::server_platform("graphics-android")));
 #endif
     return modules;
 }

=== modified file 'tests/unit-tests/shared_library_test.cpp'
--- tests/unit-tests/shared_library_test.cpp	2015-02-13 06:12:34 +0000
+++ tests/unit-tests/shared_library_test.cpp	2015-02-20 12:45:33 +0000
@@ -59,7 +59,7 @@
 public:
     SharedLibrary()
         : nonexistent_library{"imma_totally_not_a_library"},
-          existing_library{mtf::client_platform("mesa.so")},
+          existing_library{mtf::client_platform("dummy.so")},
           nonexistent_function{"yo_dawg"},
           existing_function{"create_client_platform"},
           existent_version{"MIR_CLIENT_PLATFORM_2"},

=== added file 'tests/unit-tests/test_data/libinvalid.so.3'
=== modified file 'tests/unit-tests/test_shared_library_prober.cpp'
--- tests/unit-tests/test_shared_library_prober.cpp	2015-01-21 07:34:50 +0000
+++ tests/unit-tests/test_shared_library_prober.cpp	2015-02-20 12:45:33 +0000
@@ -162,6 +162,7 @@
     EXPECT_CALL(report, loading_library(FilenameMatches("libarmhf.so")));
     EXPECT_CALL(report, loading_library(FilenameMatches("libi386.so")));
     EXPECT_CALL(report, loading_library(FilenameMatches("libarm64.so")));
+    EXPECT_CALL(report, loading_library(FilenameMatches("libinvalid.so.3")));
 
     mir::libraries_for_path(library_path, report);
 }
@@ -175,6 +176,7 @@
     bool amd64_failed{false};
     bool i386_failed{false};
     bool arm64_failed{false};
+    bool invalid_failed{false};
 
     ON_CALL(report, loading_failed(FilenameMatches("libamd64.so"), _))
             .WillByDefault(InvokeWithoutArgs([&amd64_failed]() { amd64_failed = true; }));
@@ -184,8 +186,11 @@
             .WillByDefault(InvokeWithoutArgs([&i386_failed]() { i386_failed = true; }));
     ON_CALL(report, loading_failed(FilenameMatches("libarm64.so"), _))
             .WillByDefault(InvokeWithoutArgs([&arm64_failed]() { arm64_failed = true; }));
+    ON_CALL(report, loading_failed(FilenameMatches("libinvalid.so.3"), _))
+            .WillByDefault(InvokeWithoutArgs([&invalid_failed]() { invalid_failed = true; }));
 
     mir::libraries_for_path(library_path, report);
 
+    EXPECT_TRUE(invalid_failed);
     EXPECT_TRUE(i386_failed || amd64_failed || armhf_failed || arm64_failed);
 }