Merge lp:~andreas-pokorny/mir/fix-1528135 into lp:mir

[Andreas Pokorny]

Handle exceptions during platform construction

Since we no longer assign the mir::SharedLibrary instance for a graphics platform to a global variable or a DefaultServerConfiguration member, the SharedLibrary is destroyed when the unwinding leaves the_graphics_platform(). When we rethrow the exception - to create detailed diagnostis - libstdc++ tries to access the unwinding information. But at point in time it is no longer available.

I was looking for a more generic solution. But the problem cannot be solved from within make_module_ptr since make_module_ptr is still within the shared library. I.e. one attempt was to attach the SharedLibrary to the exception object instead. That helped only halfways - the exception diagnostic could be printed but still the unwinding information was accessed by libstdc++ again after that. So it just crashed later. I only see a solution that catches the exception outside the library but not too far so that the offending library is still alive...

So the original solution remains unchanged.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3240
https://mir-jenkins.ubuntu.com/job/mir-ci/40/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/39/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/40/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

No test?

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3240
http://jenkins.qa.ubuntu.com/job/mir-ci/6004/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5517
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4424
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5473/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/328
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/328
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5470
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5470/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7944/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26610

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3240
http://jenkins.qa.ubuntu.com/job/mir-ci/6006/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/330
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/330
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5472
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7946
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/266
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/124
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26630

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

I'm all for fixing bug 1528135 by any means. But it doesn't help the fact that make_module_ptr is fundamentally unsafe and needs fixing or removing completely. We can however treat them as separate issues...
  https://code.launchpad.net/~vanvugt/mir/fix-1527449/+merge/281969

review: Abstain

[Andreas Pokorny (andreas-pokorny)]

> No test?

Oh right I just need a platform that throws on construcion.

[Andreas Pokorny (andreas-pokorny)]

Ok this need another change. The test platform is incomplete the exception is thrown to early..

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3241
https://mir-jenkins.ubuntu.com/job/mir-ci/52/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/52/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3242
https://mir-jenkins.ubuntu.com/job/mir-ci/54/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/54/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3241
http://jenkins.qa.ubuntu.com/job/mir-ci/6017/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5533/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4440/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5489
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/341/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/341/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5486
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5486/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7957
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26654

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3242
http://jenkins.qa.ubuntu.com/job/mir-ci/6019/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5535
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4442/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5491
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/343/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/343/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5488
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5488/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7959
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26671

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3242
http://jenkins.qa.ubuntu.com/job/mir-ci/6023/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5539
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4446/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5495
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/347/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/347/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5492
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5492/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7963
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26680

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

8: [----------] 1 test from ServerShutdownWithException
8: [ RUN ] ServerShutdownWithException.clean_shutdown_on_plugin_construction_exception
8: unknown file: Failure
8: C++ exception with description "unrecognised option 'logging'" thrown in the test body.
8: [ FAILED ] ServerShutdownWithException.clean_shutdown_on_plugin_construction_exception (6 ms)
8: [----------] 1 test from ServerShutdownWithException (6 ms total)
8:

not the exception i was looking for..

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3243
https://mir-jenkins.ubuntu.com/job/mir-ci/72/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/72/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/72/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3243
http://jenkins.qa.ubuntu.com/job/mir-ci/6035/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5556/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5509/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3244
http://jenkins.qa.ubuntu.com/job/mir-ci/6039/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5560
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4467/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5516
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/363/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/363/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5513
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5513/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7977
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26726

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

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Sure.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3244
https://mir-jenkins.ubuntu.com/job/mir-ci/77/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/77/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/77/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3245
https://mir-jenkins.ubuntu.com/job/mir-ci/102/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/102/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/102/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3245
http://jenkins.qa.ubuntu.com/job/mir-ci/6075/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/399
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/399/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/399
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/399/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5565
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5565/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8014
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/302
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/302/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/158
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26846

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

review: Approve (continuous-integration)

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2015-10-13 02:10:53 +0000
+++ debian/mir-test-tools.install	2016-01-20 18:02:01 +0000
@@ -9,6 +9,7 @@
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so
 usr/lib/*/mir/server-platform/graphics-dummy.so
+usr/lib/*/mir/server-platform/graphics-throw.so
 usr/lib/*/mir/server-platform/input-stub.so
 usr/lib/*/mir/client-platform/dummy.so
 usr/share/udev_recordings

=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2016-01-18 15:48:38 +0000
+++ src/server/graphics/default_configuration.cpp	2016-01-20 18:02:01 +0000
@@ -38,12 +38,14 @@
 #include "mir/abnormal_exit.h"
 #include "mir/emergency_cleanup.h"
 #include "mir/log.h"
+#include "mir/report_exception.h"
 
 #include "mir_toolkit/common.h"
 
 #include <boost/throw_exception.hpp>
 
 #include <map>
+#include <sstream>
 
 namespace mg = mir::graphics;
 namespace ml = mir::logging;
@@ -73,51 +75,61 @@
         [this]()->std::shared_ptr<mg::Platform>
         {
             std::shared_ptr<mir::SharedLibrary> platform_library;
-
-            // if a host socket is set we should use the host graphics module to create a "guest" platform
-            if (the_options()->is_set(options::host_socket_opt))
-            {
-                auto const host_connection = the_host_connection();
-
-                platform_library = std::make_shared<mir::SharedLibrary>(host_connection->graphics_platform_library());
-
-                auto create_guest_platform = platform_library->load_function<mg::CreateGuestPlatform>(
-                    "create_guest_platform",
-                    MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
-
-                return create_guest_platform(the_display_report(), host_connection);
-            }
-
-            // fallback to standalone if host socket is unset
-            if (the_options()->is_set(options::platform_graphics_lib))
-            {
-                platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
-            }
-            else
-            {
-                auto const& path = the_options()->get<std::string>(options::platform_path);
-                auto platforms = mir::libraries_for_path(path, *the_shared_library_prober_report());
-                if (platforms.empty())
-                {
-                    auto msg = "Failed to find any platform plugins in: " + path;
-                    throw std::runtime_error(msg.c_str());
-                }
-                platform_library = mir::graphics::module_for_device(platforms, dynamic_cast<mir::options::ProgramOption&>(*the_options()));
-            }
-            auto create_host_platform = platform_library->load_function<mg::CreateHostPlatform>(
-                "create_host_platform",
-                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
-            auto describe_module = platform_library->load_function<mg::DescribeModule>(
-                "describe_graphics_module",
-                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
-            auto description = describe_module();
-            mir::log_info("Selected driver: %s (version %d.%d.%d)",
-                          description->name,
-                          description->major_version,
-                          description->minor_version,
-                          description->micro_version);
-
-            return create_host_platform(the_options(), the_emergency_cleanup(), the_display_report());
+            std::stringstream error_report;
+            try
+            {
+                // if a host socket is set we should use the host graphics module to create a "guest" platform
+                if (the_options()->is_set(options::host_socket_opt))
+                {
+                    auto const host_connection = the_host_connection();
+
+                    platform_library = std::make_shared<mir::SharedLibrary>(host_connection->graphics_platform_library());
+
+                    auto create_guest_platform = platform_library->load_function<mg::CreateGuestPlatform>(
+                        "create_guest_platform",
+                        MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+
+                    return create_guest_platform(the_display_report(), host_connection);
+                }
+
+                // fallback to standalone if host socket is unset
+                if (the_options()->is_set(options::platform_graphics_lib))
+                {
+                    platform_library = std::make_shared<mir::SharedLibrary>(the_options()->get<std::string>(options::platform_graphics_lib));
+                }
+                else
+                {
+                    auto const& path = the_options()->get<std::string>(options::platform_path);
+                    auto platforms = mir::libraries_for_path(path, *the_shared_library_prober_report());
+                    if (platforms.empty())
+                    {
+                        auto msg = "Failed to find any platform plugins in: " + path;
+                        throw std::runtime_error(msg.c_str());
+                    }
+                    platform_library = mir::graphics::module_for_device(platforms, dynamic_cast<mir::options::ProgramOption&>(*the_options()));
+                }
+                auto create_host_platform = platform_library->load_function<mg::CreateHostPlatform>(
+                    "create_host_platform",
+                    MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+                auto describe_module = platform_library->load_function<mg::DescribeModule>(
+                    "describe_graphics_module",
+                    MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+                auto description = describe_module();
+                mir::log_info("Selected driver: %s (version %d.%d.%d)",
+                              description->name,
+                              description->major_version,
+                              description->minor_version,
+                              description->micro_version);
+
+                return create_host_platform(the_options(), the_emergency_cleanup(), the_display_report());
+            }
+            catch(...)
+            {
+                // access exception information before platform library gets unloaded
+                error_report << "Exception while creating graphics platform" << std::endl;
+                mir::report_exception(error_report);
+            }
+            BOOST_THROW_EXCEPTION(std::runtime_error(error_report.str()));
         });
 }
 

=== modified file 'tests/acceptance-tests/test_server_shutdown.cpp'
--- tests/acceptance-tests/test_server_shutdown.cpp	2015-08-20 08:40:03 +0000
+++ tests/acceptance-tests/test_server_shutdown.cpp	2016-01-20 18:02:01 +0000
@@ -17,14 +17,19 @@
  */
 
 #include "mir/fatal.h"
+#include "mir/server.h"
 
 #include "mir_test_framework/interprocess_client_server_test.h"
 #include "mir_test_framework/process.h"
+#include "mir_test_framework/temporary_environment_value.h"
+#include "mir_test_framework/executable_path.h"
+#include "mir/test/doubles/null_logger.h"
 
 #include <gtest/gtest.h>
 
 namespace mt = mir::test;
 namespace mtf = mir_test_framework;
+namespace mtd = mt::doubles;
 
 using ServerShutdown = mtf::InterprocessClientServerTest;
 
@@ -50,6 +55,21 @@
     }
 }
 
+// Regression test for LP: #1528135
+TEST(ServerShutdownWithException, clean_shutdown_on_plugin_construction_exception)
+{
+    char const* argv = "ServerShutdownWithException";
+    mtf::TemporaryEnvironmentValue graphics_platform("MIR_SERVER_PLATFORM_GRAPHICS_LIB", mtf::server_platform("graphics-throw.so").c_str());
+    mtf::TemporaryEnvironmentValue input_platform("MIR_SERVER_PLATFORM_INPUT_LIB", mtf::server_platform("input-stub.so").c_str());
+    mir::Server server;
+
+    server.add_configuration_option(mtd::logging_opt, mtd::logging_descr, false);
+    server.set_command_line_handler([](int, char const* const*){});
+    server.set_command_line(0, &argv);
+    server.apply_settings();
+    server.run();
+}
+
 using ServerShutdownDeathTest = ServerShutdown;
 
 TEST_F(ServerShutdownDeathTest, abort_removes_endpoint)

=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt	2016-01-12 03:56:59 +0000
+++ tests/mir_test_framework/CMakeLists.txt	2016-01-20 18:02:01 +0000
@@ -154,6 +154,25 @@
   LINK_FLAGS "-Wl,--version-script,${server_symbol_map}"
 )
 
+add_library(
+  mirplatformgraphicsthrow MODULE
+  platform_graphics_throw.cpp
+)
+
+target_link_libraries(
+  mirplatformgraphicsthrow 
+
+  mirplatform
+)
+
+set_target_properties(
+  mirplatformgraphicsthrow PROPERTIES;
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
+  OUTPUT_NAME graphics-throw
+  PREFIX ""
+  LINK_FLAGS "-Wl,--version-script,${server_symbol_map}"
+)
+
 add_custom_command(TARGET mir-test-framework-static POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
   ${CMAKE_CURRENT_SOURCE_DIR}/udev_recordings ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/udev_recordings
@@ -168,6 +187,7 @@
 string (REPLACE " -Wl,--no-undefined" " " CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
 
 install(TARGETS mirplatformgraphicsstub LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
+install(TARGETS mirplatformgraphicsthrow LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
 
 install(TARGETS mirclientplatformstub LIBRARY DESTINATION ${MIR_CLIENT_PLATFORM_PATH})
 

=== added file 'tests/mir_test_framework/platform_graphics_throw.cpp'
--- tests/mir_test_framework/platform_graphics_throw.cpp	1970-01-01 00:00:00 +0000
+++ tests/mir_test_framework/platform_graphics_throw.cpp	2016-01-20 18:02:01 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2015 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: Andreas Pokorny <[e-mail]>
+ */
+
+#include "mir/graphics/platform.h"
+#include "mir/test/doubles/null_platform.h"
+#include "mir/assert_module_entry_point.h"
+#include "mir/libname.h"
+
+#include <boost/throw_exception.hpp>
+
+namespace mg = mir::graphics;
+namespace mo = mir::options;
+namespace mir
+{
+namespace options
+{
+class ProgramOption;
+}
+}
+
+namespace
+{
+class ExceptionThrowingPlatform : public mir::test::doubles::NullPlatform
+{
+public:
+    ExceptionThrowingPlatform()
+    {
+        BOOST_THROW_EXCEPTION(std::runtime_error("Exception during construction"));
+    }
+};
+
+}
+
+mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& /*options*/)
+{
+    mir::assert_entry_point_signature<mg::PlatformProbe>(&probe_graphics_platform);
+    return mg::PlatformPriority::unsupported;
+}
+
+mir::ModuleProperties const description {
+    "throw-on-creation",
+    MIR_VERSION_MAJOR,
+    MIR_VERSION_MINOR,
+    MIR_VERSION_MICRO,
+    mir::libname()
+};
+
+mir::ModuleProperties const* describe_graphics_module()
+{
+    mir::assert_entry_point_signature<mg::DescribeModule>(&describe_graphics_module);
+    return &description;
+}
+
+void add_graphics_platform_options(boost::program_options::options_description&)
+{
+    mir::assert_entry_point_signature<mg::AddPlatformOptions>(&add_graphics_platform_options);
+}
+
+mir::UniqueModulePtr<mg::Platform> create_host_platform(
+    std::shared_ptr<mo::Option> const&,
+    std::shared_ptr<mir::EmergencyCleanupRegistry> const&,
+    std::shared_ptr<mg::DisplayReport> const&)
+{
+    mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);
+    return mir::make_module_ptr<ExceptionThrowingPlatform>();
+}
+
+mir::UniqueModulePtr<mg::Platform> create_guest_platform(
+    std::shared_ptr<mg::DisplayReport> const&,
+    std::shared_ptr<mg::NestedContext> const&)
+{
+    mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);
+    return mir::make_module_ptr<ExceptionThrowingPlatform>();
+}