Merge into ubuntu : 0.24 : Code : Mir

Status:	Merged
Approved by:	Andreas Pokorny on 2016-09-29
Approved revision:	3641
Merged at revision:	1291
Proposed branch:	lp:mir/0.24
Merge into:	lp:mir/ubuntu
Diff against target:	462 lines (+220/-20) 19 files modified CMakeLists.txt (+1/-1) debian/changelog (+20/-0) src/client/buffer_factory.cpp (+1/-1) src/client/input/xkb_mapper.cpp (+2/-1) src/client/rpc/mir_protobuf_rpc_channel.cpp (+0/-5) src/common/dispatch/CMakeLists.txt (+1/-0) src/common/dispatch/legacy_readable_fd.cpp (+34/-0) src/common/symbols.map (+9/-0) src/platforms/eglstream-kms/client/client_platform.cpp (+1/-2) src/platforms/eglstream-kms/client/client_platform.h (+1/-4) src/platforms/eglstream-kms/server/platform.cpp (+1/-2) src/platforms/eglstream-kms/server/platform.h (+0/-1) src/server/graphics/nested/display_buffer.cpp (+1/-0) src/server/shell/abstract_shell.cpp (+3/-1) tests/unit-tests/client/input/test_xkb_mapper.cpp (+9/-0) tests/unit-tests/graphics/mesa/test_ipc_operations.cpp (+4/-0) tests/unit-tests/graphics/nested/CMakeLists.txt (+1/-0) tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp (+105/-0) tests/unit-tests/scene/test_abstract_shell.cpp (+26/-2)
To merge this branch:	bzr merge lp:mir/0.24
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Cemil Azizoglu (community)			Approve on 2016-09-30
Mir CI Bot	continuous-integration	2016-09-27	Approve on 2016-09-28
Daniel van Vugt		2016-09-27	Approve on 2016-09-28
Review via email: mp+306847@code.launchpad.net

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-09-27: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-09-27: Posted in a previous version of this proposal

#

Wrong target branch. You mean lp:mir/ubuntu

review: Needs Resubmitting

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-09-27:

#

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

review: Needs Fixing (continuous-integration)

lp:mir/0.24 updated on 2016-09-28

3635. By Daniel van Vugt on 2016-09-28

debian/changelog: Fix up version format

Remember we're releasing Mir-for-Ubuntu and not a definitive one
release for all distros.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-09-28:

#

^^^
Bug 1609612. And it's non-trivial to backport all the fixes.

lp:mir/0.24 updated on 2016-09-28

3636. By Daniel van Vugt on 2016-09-28: Cherry pick r3625 from lp:mir (LP: #1609612 fix 1 of 3)
3637. By Daniel van Vugt on 2016-09-28: Cherry pick r3635 from lp:mir (LP: #1609612 fix 2 of 3)
3638. By Daniel van Vugt on 2016-09-28: Mention LP: #1609612 in the changelog

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-09-28:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-09-28:

#

^^^
Bug 1612012 now

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-09-28:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-09-28:

#

^^^
Bug 1612012 and a new one:
[ FAILED ] NestedInput.on_input_device_state_nested_server_emits_input_device_state

Although I won't log that new one because this isn't trunk.

lp:mir/0.24 updated on 2016-09-28

3639. By Daniel van Vugt on 2016-09-28: Cherry pick r3656 from lp:mir to fix CI failures (and a potential
crash) (LP: #1612012)
3640. By Daniel van Vugt on 2016-09-28: Mention LP: #1612012 in the changelog

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-09-28:

#

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

PASSED: Continuous integration, rev:3640
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/58/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2320
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2383
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2374
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2374
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2374
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2348
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2348/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2348
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2348/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2348
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2348/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2348
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2348/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2348
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2348/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-09-28:

#

Cool.

review: Approve

lp:mir/0.24 updated on 2016-09-28

3641. By Andreas Pokorny on 2016-09-28: cherry picked bug fix from lp:mir

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-09-28:

#

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

PASSED: Continuous integration, rev:3641
https://mir-jenkins.ubuntu.com/job/mir-ubuntu-ci/59/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2321
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2384
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2375
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2375
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2375
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2349
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2349/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2349
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2349/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2349
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2349/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2349
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2349/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2349
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2349/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-09-30:

#

LGTM

review: Approve

Mir

Merge lp:mir/0.24 into lp:mir/ubuntu

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-08-09 16:24:17 +0000
 +++ CMakeLists.txt	2016-09-28 12:03:27 +0000
@@ -29,7 +29,7 @@
  set(MIR_VERSION_MAJOR 0)
  set(MIR_VERSION_MINOR 24)
--set(MIR_VERSION_PATCH 0)
++set(MIR_VERSION_PATCH 1)
  add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
  add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
 === modified file 'debian/changelog'
 --- debian/changelog	2016-08-15 16:29:03 +0000
 +++ debian/changelog	2016-09-28 12:03:27 +0000
@@ -1,3 +1,23 @@
++mir (0.24.1-0ubuntu1) UNRELEASED; urgency=medium
++
++  * New upstream release 0.24.1 (https://launchpad.net/mir/+milestone/0.24.1)
++    - ABI summary:
++      . All ABI numbers remain unchanged.
++      . mircommon ABI at 6, but now including a symbol misplaced in 0.24.0
++    - Bugs fixed:
++      . mirserver ignored further keymap configuration changes after a keyboard
++        is configured (LP: #1626435)
++      . fix for libmircommon.so.6 ABI break: version stanza of
++        mir::dispatch::ReadableFd* moved to newer version (LP: #1617865)
++      . clang builds fail (again) (LP: #1609612)
++      . Valgrind errors in NesterServer.* cause subsequent tests
++        (ServerDisconnect, ServerStartup, UnresponsiveClient) to fail
++        (LP: #1612012)
++      . Break potentially infinite loop in search for next session to focus
++        (LP: #1625401)
++
++ -- Andreas Pokorny <andreas.pokorny@canonical.com>  Tue, 27 Sep 2016 09:50:08 +0200
++
  mir (0.24.0+16.10.20160815.3-0ubuntu1) yakkety; urgency=medium
    * New upstream release 0.24.0 (https://launchpad.net/mir/+milestone/0.24.0)
 === modified file 'src/client/buffer_factory.cpp'
 --- src/client/buffer_factory.cpp	2016-06-24 18:19:58 +0000
 +++ src/client/buffer_factory.cpp	2016-09-28 12:03:27 +0000
@@ -86,7 +86,7 @@
+     }
      allocation_requests.erase(request_it);
--    return std::move(b);
++    return b;
+ }
  void mcl::BufferFactory::cancel_requests_with_context(void* cancelled_context)
 === modified file 'src/client/input/xkb_mapper.cpp'
 --- src/client/input/xkb_mapper.cpp	2016-07-14 09:19:49 +0000
 +++ src/client/input/xkb_mapper.cpp	2016-09-28 12:03:27 +0000
@@ -148,10 +148,10 @@
          auto input_event = mir_event_get_input_event(&ev);
          auto input_type = mir_input_event_get_type(input_event);
          auto device_id = mir_input_event_get_device_id(input_event);
--        auto mapping_state = get_keymapping_state(device_id);
          if (input_type == mir_input_event_type_key)
+         {
++            auto mapping_state = get_keymapping_state(device_id);
              if (mapping_state && mapping_state->update_and_map(ev))
                  update_modifier();
+         }
@@ -211,6 +211,7 @@
+ {
      std::lock_guard<std::mutex> lg(guard);
++    device_mapping.erase(id);
      device_mapping.emplace(std::piecewise_construct,
                             std::forward_as_tuple(id),
                             std::forward_as_tuple(std::move(new_keymap)));
 === modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
 --- src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-06-24 17:52:00 +0000
 +++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-09-28 12:03:27 +0000
@@ -52,11 +52,6 @@
  namespace md = mir::dispatch;
  namespace mp = mir::protobuf;
--namespace
--{
--std::chrono::milliseconds const timeout(200);
--}
--
  mclr::MirProtobufRpcChannel::MirProtobufRpcChannel(
      std::unique_ptr<mclr::StreamTransport> transport,
      std::shared_ptr<mcl::SurfaceMap> const& surface_map,
 === modified file 'src/common/dispatch/CMakeLists.txt'
 --- src/common/dispatch/CMakeLists.txt	2016-01-29 08:18:22 +0000
 +++ src/common/dispatch/CMakeLists.txt	2016-09-28 12:03:27 +0000
@@ -19,6 +19,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/action_queue.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/multiplexing_dispatchable.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/readable_fd.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/legacy_readable_fd.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/threaded_dispatcher.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp
+ )
 === added file 'src/common/dispatch/legacy_readable_fd.cpp'
 --- src/common/dispatch/legacy_readable_fd.cpp	1970-01-01 00:00:00 +0000
 +++ src/common/dispatch/legacy_readable_fd.cpp	2016-09-28 12:03:27 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright © 2016 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: Daniel van Vugt <daniel.van.vugt@canonical.com>
++ *
++ * TODO: Remove this file at the next mircommon ABI break.
++ */
++
++#define ReadableFd LegacyReadableFd
++
++#include "mir/dispatch/readable_fd.h"
++
++__asm__(".symver _ZN3mir8dispatch16LegacyReadableFd8dispatchEj,_ZN3mir8dispatch10ReadableFd8dispatchEj@MIR_COMMON_5.1");
++__asm__(".symver _ZN3mir8dispatch16LegacyReadableFdC1ENS_2FdERKSt8functionIFvvEE,_ZN3mir8dispatch10ReadableFdC1ENS_2FdERKSt8functionIFvvEE@MIR_COMMON_5.1");
++__asm__(".symver _ZN3mir8dispatch16LegacyReadableFdC2ENS_2FdERKSt8functionIFvvEE,_ZN3mir8dispatch10ReadableFdC2ENS_2FdERKSt8functionIFvvEE@MIR_COMMON_5.1");
++__asm__(".symver _ZN3mir8dispatch16LegacyReadableFdD0Ev,_ZN3mir8dispatch10ReadableFdD0Ev@MIR_COMMON_5.1");
++__asm__(".symver _ZN3mir8dispatch16LegacyReadableFdD1Ev,_ZN3mir8dispatch10ReadableFdD1Ev@MIR_COMMON_5.1");
++__asm__(".symver _ZN3mir8dispatch16LegacyReadableFdD2Ev,_ZN3mir8dispatch10ReadableFdD2Ev@MIR_COMMON_5.1");
++__asm__(".symver _ZNK3mir8dispatch16LegacyReadableFd8watch_fdEv,_ZNK3mir8dispatch10ReadableFd8watch_fdEv@MIR_COMMON_5.1");
++__asm__(".symver _ZNK3mir8dispatch16LegacyReadableFd15relevant_eventsEv,_ZNK3mir8dispatch10ReadableFd15relevant_eventsEv@MIR_COMMON_5.1");
++
++#include "./readable_fd.cpp"
 === modified file 'src/common/symbols.map'
 --- src/common/symbols.map	2016-07-20 12:09:17 +0000
 +++ src/common/symbols.map	2016-09-28 12:03:27 +0000
@@ -382,7 +382,16 @@
         android::MotionEvent::initialize*;
         mir::dispatch::epoll_to_fd_event*;
         mir::dispatch::fd_event_to_epoll*;
++
++       #
++       # This entry is a bug LP: #1617865 which now overrides the other entries
++       # for ReadableFd in MIR_COMMON_5.1 above. But rather than remove it and
++       # break the ABI again we have re-exported the old MIR_COMMON_5.1
++       # symbols using assembler directives in:
++       #   src/common/dispatch/legacy_readable_fd.cpp
++       #
         mir::dispatch::ReadableFd*;
++
         vtable?for?mir::dispatch::ReadableFd;
      };
  } MIR_COMMON_0.22;
 === modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
 --- src/platforms/eglstream-kms/client/client_platform.cpp	2016-05-31 01:21:42 +0000
 +++ src/platforms/eglstream-kms/client/client_platform.cpp	2016-09-28 12:03:27 +0000
@@ -29,8 +29,7 @@
  namespace mcle=mir::client::eglstream;
  namespace geom=mir::geometry;
--mcle::ClientPlatform::ClientPlatform(ClientContext* const context)
--    : context{context}
++mcle::ClientPlatform::ClientPlatform(ClientContext* const)
+ {
+ }
 === modified file 'src/platforms/eglstream-kms/client/client_platform.h'
 --- src/platforms/eglstream-kms/client/client_platform.h	2016-05-31 01:21:42 +0000
 +++ src/platforms/eglstream-kms/client/client_platform.h	2016-09-28 12:03:27 +0000
@@ -30,7 +30,7 @@
  class ClientPlatform : public client::ClientPlatform
+ {
  public:
--    ClientPlatform(ClientContext* const context);
++    ClientPlatform(ClientContext* const);
      MirPlatformType platform_type() const override;
      void populate(MirPlatformPackage& package) const override;
@@ -40,9 +40,6 @@
      std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
      MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
      MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
--
--private:
--    ClientContext* const context;
  };
+ }
 === modified file 'src/platforms/eglstream-kms/server/platform.cpp'
 --- src/platforms/eglstream-kms/server/platform.cpp	2016-07-20 04:54:07 +0000
 +++ src/platforms/eglstream-kms/server/platform.cpp	2016-09-28 12:03:27 +0000
@@ -55,8 +55,7 @@
      EGLDeviceEXT device,
      std::shared_ptr<EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
      std::shared_ptr<DisplayReport> const& /*report*/)
--    : device{device},
--      display{EGL_NO_DISPLAY},
++    : display{EGL_NO_DISPLAY},
        drm_node{open(drm_node_for_device(device), O_RDWR | O_CLOEXEC)}
+ {
      using namespace std::literals;
 === modified file 'src/platforms/eglstream-kms/server/platform.h'
 --- src/platforms/eglstream-kms/server/platform.h	2016-07-20 04:54:07 +0000
 +++ src/platforms/eglstream-kms/server/platform.h	2016-09-28 12:03:27 +0000
@@ -53,7 +53,6 @@
      UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
  private:
--    EGLDeviceEXT device;
      EGLDisplay display;
      mir::Fd const drm_node;
  };
 === modified file 'src/server/graphics/nested/display_buffer.cpp'
 --- src/server/graphics/nested/display_buffer.cpp	2016-06-10 13:50:29 +0000
 +++ src/server/graphics/nested/display_buffer.cpp	2016-09-28 12:03:27 +0000
@@ -93,6 +93,7 @@
  mgn::detail::DisplayBuffer::~DisplayBuffer() noexcept
+ {
++    host_surface->set_event_handler(nullptr, nullptr);
+ }
  void mgn::detail::DisplayBuffer::event_thunk(
 === modified file 'src/server/shell/abstract_shell.cpp'
 --- src/server/shell/abstract_shell.cpp	2016-07-01 20:32:34 +0000
 +++ src/server/shell/abstract_shell.cpp	2016-09-28 12:03:27 +0000
@@ -193,12 +193,14 @@
      std::unique_lock<std::mutex> lock(focus_mutex);
      auto const focused_session = focus_session.lock();
      auto successor = session_coordinator->successor_of(focused_session);
++    auto const sentinel = successor;
      while (successor != nullptr &&
--           successor != focused_session &&
             successor->default_surface() == nullptr)
+     {
          successor = session_coordinator->successor_of(successor);
++        if (successor == sentinel)
++            break;
+     }
      auto const surface = successor ? successor->default_surface() : nullptr;
 === modified file 'tests/unit-tests/client/input/test_xkb_mapper.cpp'
 --- tests/unit-tests/client/input/test_xkb_mapper.cpp	2016-07-14 09:18:37 +0000
 +++ tests/unit-tests/client/input/test_xkb_mapper.cpp	2016-09-28 12:03:27 +0000
@@ -325,3 +325,12 @@
      map_event(keyboard_cz, mir_keyboard_action_up, KEY_CAPSLOCK);
      map_event(keyboard_cz, mir_keyboard_action_down, KEY_2);
+ }
++
++TEST_F(XKBMapper, setting_keymap_again_overwrites_keymap)
++{
++    auto keyboard = MirInputDeviceId{3};
++    mapper.set_keymap_for_device(keyboard, mi::Keymap{"pc105", "us", "",""});
++    EXPECT_EQ(XKB_KEY_y, map_key(keyboard, mir_keyboard_action_down, KEY_Y));
++    mapper.set_keymap_for_device(keyboard, mi::Keymap{"pc105", "de", "",""});
++    EXPECT_EQ(XKB_KEY_y, map_key(keyboard, mir_keyboard_action_down, KEY_Z));
++}
 === modified file 'tests/unit-tests/graphics/mesa/test_ipc_operations.cpp'
 --- tests/unit-tests/graphics/mesa/test_ipc_operations.cpp	2016-05-06 01:56:46 +0000
 +++ tests/unit-tests/graphics/mesa/test_ipc_operations.cpp	2016-09-28 12:03:27 +0000
@@ -84,7 +84,11 @@
          EXPECT_CALL(mock_buffer_msg, pack_fd(mtd::RawFdMatcher(native_handle.fd[i])));
      for(auto i = 0; i < native_handle.data_items; i++)
          EXPECT_CALL(mock_buffer_msg, pack_data(native_handle.data[i]));
++#ifndef __clang__
++    // FIXME: Why can't clang compile this on yakkety (with the
++    //        gcc6 headers)? (LP: #1609612)
      EXPECT_CALL(mock_buffer_msg, pack_stride(dummy_stride));
++#endif
      EXPECT_CALL(mock_buffer_msg, pack_flags(testing::_));
      EXPECT_CALL(mock_buffer_msg, pack_size(dummy_size));
 === modified file 'tests/unit-tests/graphics/nested/CMakeLists.txt'
 --- tests/unit-tests/graphics/nested/CMakeLists.txt	2015-06-17 05:20:42 +0000
 +++ tests/unit-tests/graphics/nested/CMakeLists.txt	2016-09-28 12:03:27 +0000
@@ -1,6 +1,7 @@
  list(APPEND UNIT_TEST_SOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_display_configuration.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_display.cpp
++  ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_display_buffer.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/mir_display_configuration_builder.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/test_nested_cursor.cpp
+ )
 === added file 'tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp'
 --- tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp	2016-09-28 12:03:27 +0000
@@ -0,0 +1,105 @@
++/*
++ * Copyright © 2016 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: Alexandros Frantzis <alexandros.frantzis@canonical.com>
++ */
++
++#include "src/server/graphics/nested/display_buffer.h"
++
++#include "mir/events/event_builders.h"
++
++#include "mir/test/doubles/mock_egl.h"
++#include "mir/test/doubles/stub_gl_config.h"
++#include "mir/test/doubles/stub_host_connection.h"
++#include "mir/test/fake_shared.h"
++
++#include <gtest/gtest.h>
++#include <gmock/gmock.h>
++
++namespace mgn = mir::graphics::nested;
++namespace mgnd = mgn::detail;
++namespace mt = mir::test;
++namespace mtd = mir::test::doubles;
++
++namespace
++{
++
++class EventHostSurface : public mgn::HostSurface
++{
++public:
++    EGLNativeWindowType egl_native_window() override { return {}; }
++
++    void set_event_handler(mir_surface_event_callback cb, void* ctx) override
++    {
++        std::lock_guard<std::mutex> lock{event_mutex};
++        event_handler = cb;
++        event_context = ctx;
++    }
++
++    void emit_input_event()
++    {
++        auto const ev = mir::events::make_event(
++            MirInputDeviceId(), {}, std::vector<uint8_t>{},
++            MirKeyboardAction(), 0, 0, MirInputEventModifiers());
++
++        std::lock_guard<std::mutex> lock{event_mutex};
++        // Normally we shouldn't call external code under lock, but, for our
++        // test use case, doing so is safe and simplifies the test code.
++        if (event_handler)
++            event_handler(nullptr, ev.get(), event_context);
++    }
++
++private:
++    std::mutex event_mutex;
++    mir_surface_event_callback event_handler;
++    void* event_context;
++};
++
++struct NestedDisplayBuffer : testing::Test
++{
++    auto create_display_buffer()
++    {
++        return std::make_shared<mgnd::DisplayBuffer>(
++            egl_display,
++            mt::fake_shared(host_surface),
++            mir::geometry::Rectangle{},
++            MirPixelFormat{},
++            std::make_shared<mtd::StubHostConnection>()
++            );
++    }
++
++    testing::NiceMock<mtd::MockEGL> mock_egl;
++    mgnd::EGLDisplayHandle egl_display{nullptr, std::make_shared<mtd::StubGLConfig>()};
++    EventHostSurface host_surface;
++};
++
++}
++
++// Regression test for LP: #1612012
++// This test is trying to reproduce a race, so it's not deterministic, but
++// in practice the reproduction rate is very close to 100%.
++TEST_F(NestedDisplayBuffer, event_dispatch_does_not_race_with_destruction)
++{
++    auto display_buffer = create_display_buffer();
++    std::thread t{
++        [&]
++        {
++            for (int i = 0; i < 100; ++i)
++                host_surface.emit_input_event();
++        }};
++
++    display_buffer.reset();
++    t.join();
++}
 === modified file 'tests/unit-tests/scene/test_abstract_shell.cpp'
 --- tests/unit-tests/scene/test_abstract_shell.cpp	2016-07-01 20:32:34 +0000
 +++ tests/unit-tests/scene/test_abstract_shell.cpp	2016-09-28 12:03:27 +0000
@@ -544,9 +544,9 @@
      session->destroy_surface(surface_id);
      EXPECT_CALL(session_container, successor_of(session)).
--        WillOnce(Return(session1));
++        WillRepeatedly(Return(session1));
      EXPECT_CALL(session_container, successor_of(session1)).
--        WillOnce(Return(session));
++        WillRepeatedly(Return(session));
      EXPECT_CALL(session_event_sink, handle_no_focus());
@@ -589,6 +589,30 @@
      shell.modify_surface(session, surface, stream_modification);
+ }
++// lp:1625401
++TEST_F(AbstractShell, when_remaining_session_has_no_surface_focus_next_session_doesnt_loop_endlessly)
++{
++    std::shared_ptr<ms::Session> empty_session =
++        shell.open_session(__LINE__, "empty_session", std::shared_ptr<mf::EventSink>());
++
++    {
++        std::shared_ptr<ms::Session> another_session =
++            shell.open_session(__LINE__, "another_session", std::shared_ptr<mf::EventSink>());
++
++        auto creation_params = ms::a_surface()
++            .with_buffer_stream(another_session->create_buffer_stream(properties));
++        auto surface_id = shell.create_surface(another_session, creation_params, nullptr);
++
++        shell.set_focus_to(another_session, another_session->surface(surface_id));
++
++        shell.close_session(another_session);
++    }
++
++    ON_CALL(session_container, successor_of(_)).WillByDefault(Return(empty_session));
++
++    shell.focus_next_session();
++}
++
  namespace mir
+ {
  namespace scene