Mir

Merge lp://staging/~kdub/mir/fix-1664562 into lp://staging/mir

  1. fix-1664562
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 4040
Proposed branch: lp://staging/~kdub/mir/fix-1664562
Merge into: lp://staging/mir
Diff against target: 900 lines (+535/-230)
10 files modified
src/server/graphics/nested/CMakeLists.txt (+1/-0)
src/server/graphics/nested/host_buffer.cpp (+183/-0)
src/server/graphics/nested/host_buffer.h (+73/-0)
src/server/graphics/nested/mir_client_host_connection.cpp (+5/-174)
tests/include/mir/test/doubles/mock_client_platform.h (+76/-0)
tests/include/mir/test/doubles/stub_client_platform_factory.h (+50/-0)
tests/include/mir/test/stub_server_tool.h (+14/-0)
tests/unit-tests/client/test_mir_render_surface.cpp (+5/-56)
tests/unit-tests/platforms/nested/CMakeLists.txt (+1/-0)
tests/unit-tests/platforms/nested/test_host_buffer.cpp (+127/-0)
To merge this branch: bzr merge lp://staging/~kdub/mir/fix-1664562
Reviewer Review Type Date Requested Status
Daniel van Vugt Abstain
Chris Halse Rogers Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+317235@code.staging.launchpad.net

Commit message

nested: make sure not to close the FD given via the fenced_buffers extension. This was causing intermittent problems with mirscreencast on fenced platforms (android)

fixes: LP: #1664562

Description of the change

nested: make sure not to close the FD given via the fenced_buffers extension. This was causing intermittent problems with mirscreencast on fenced platforms (android)

fixes: LP: #1664562

one line of change... line 448 changed to line 194. The rest was extruding classes to their own files to come up with the test.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4029
https://mir-jenkins.ubuntu.com/job/mir-ci/2995/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3990
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4076
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4066
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4066
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4066
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4017
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4017/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/4017
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4017/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4017
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4017/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4017
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4017/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/4017
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4017/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/4017
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4017/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

I'd kinda prefer this to be just the one-line change, rather than all the changes to make a test :).

That said, looks fine to me.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I agree with Chris, although it's also fine putting a larger cleanup on trunk. Only if you were backporting the fix to a stable branch like lp:mir/0.26 then you should choose the one-liner solution over this.

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches