Mir

Merge lp://qastaging/~mir-team/mir/bstream-constructor-cleanup into lp://qastaging/mir

  1. bstream-constructor-cleanup
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Work in progress
Proposed branch: lp://qastaging/~mir-team/mir/bstream-constructor-cleanup
Merge into: lp://qastaging/mir
Prerequisite: lp://qastaging/~cemil-azizoglu/mir/remove-dead-rs-support-code
Diff against target: 1052 lines (+195/-283)
11 files modified
src/client/buffer_stream.cpp (+35/-84)
src/client/buffer_stream.h (+9/-11)
src/client/mir_buffer_stream_api.cpp (+1/-1)
src/client/mir_connection.cpp (+53/-37)
src/client/mir_connection.h (+5/-8)
src/client/render_surface.cpp (+3/-4)
src/client/screencast_stream.cpp (+0/-5)
src/client/screencast_stream.h (+0/-1)
src/include/client/mir/mir_buffer_stream.h (+0/-1)
tests/unit-tests/client/test_client_buffer_stream.cpp (+63/-125)
tests/unit-tests/client/test_mir_connection.cpp (+26/-6)
To merge this branch: bzr merge lp://qastaging/~mir-team/mir/bstream-constructor-cleanup
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Needs Fixing
Daniel van Vugt Abstain
Alan Griffiths Approve
Chris Halse Rogers Approve
Mir CI Bot continuous-integration Needs Fixing
Review via email: mp+311491@code.qastaging.launchpad.net

Commit message

client: unify the constructors for mcl::BufferStream. Could be scrubbed again to reduce the number of parameters.

Description of the change

client: unify the constructors for mcl::BufferStream. Could be scrubbed again to reduce the number of parameters.

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

the few conflicts are in base, probably not too hard to review while conflicts get resolved.

Reply
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3807
https://mir-jenkins.ubuntu.com/job/mir-ci/2245/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2904/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2969
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2962
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2962
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2962
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2934/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2934/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2934/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2934
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2934/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/2934
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2934/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2934/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> the few conflicts are in base, probably not too hard to review while conflicts
> get resolved.

The prereq has been updated to remove the conflict.

Reply
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Conflicts still

review: Needs Fixing
Reply
lp://qastaging/~mir-team/mir/bstream-constructor-cleanup updated
3808. By Kevin DuBois

merge, fix up teh conflicts

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3808
https://mir-jenkins.ubuntu.com/job/mir-ci/2320/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3018/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3083
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3075
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3075
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3075
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3047/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3047/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3047/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3047/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3047/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/3047
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3047/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3047/console

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

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

LGTM.

review: Approve
Reply
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

OK

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

^^^
Jenkins failures are crashing tests. Seems like this branch needs some fixing.

review: Needs Fixing
Reply
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Abstain
Reply
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Needs an update.

Needs to remove other instances of render_surface(), e.g..

review: Needs Fixing
Reply

Unmerged revisions

3808. By Kevin DuBois

merge, fix up teh conflicts

3807. By Kevin DuBois

better handling of default steram

3806. By Kevin DuBois

merge in base

3805. By Kevin DuBois

cleanup another function, corrects int/acc tests

3804. By Kevin DuBois

port unit tests to new constructor

3803. By Kevin DuBois

fix up commented out coed

3802. By Kevin DuBois

merge in base

3801. By Kevin DuBois

need to restack on branch that removes one of constructors

3800. By Kevin DuBois

merge in mir

3799. By Kevin DuBois

merge in mir

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