Unity System Compositor

Merge lp://qastaging/~alan-griffiths/unity-system-compositor/compatibility into lp://qastaging/unity-system-compositor

  1. compatibility
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: 309
Merged at revision: 308
Proposed branch: lp://qastaging/~alan-griffiths/unity-system-compositor/compatibility
Merge into: lp://qastaging/unity-system-compositor
Diff against target: 83 lines (+18/-0)
3 files modified
tests/include/usc/test/mock_display.h (+5/-0)
tests/unit-tests/test_mir_input_configuration.cpp (+10/-0)
tests/unit-tests/test_session_switcher.cpp (+3/-0)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/unity-system-compositor/compatibility
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Alan Griffiths Abstain
Brandon Schaefer (community) Approve
Cemil Azizoglu (community) Abstain
Stephen M. Webb (community) Approve
Review via email: mp+321076@code.qastaging.launchpad.net

Commit message

Fix build against lp:mir (and Mir 0.26!)

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

PASSED: Continuous integration, rev:309
https://mir-jenkins.ubuntu.com/job/usc-ci/56/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/79
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4469
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4459
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4459
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4459
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/83/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/83
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/83/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

WFM

review: Approve
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

It would be more accurate to do

#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
class StubMirSession : public mir::frontend::Session
#else
class StubMirSession : public mir::frontend::Session, public mir::frontend::SessionExtensions
#endif

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

>
> It would be more accurate to do
>
> #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
> class StubMirSession : public mir::frontend::Session
> #else
> class StubMirSession : public mir::frontend::Session, public
> mir::frontend::SessionExtensions
> #endif

I don't understand what that refers to.

review: Needs Information
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

mir::frontend::Session has diverged (due to an API break we noticed in 0.26.1 silo) in 0.26.* from the trunk. We split the couple create_buffer() functions into another object we called mir::frontend::SessionExtensions.

So it'd be more correct for StubMirSession to be inheriting from both interfaces for Mir version < 0.27.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Seems reasonable to me, if we need to address the above issue we can in a different branch

Revision history for this message
Brandon Schaefer (brandontschaefer) :
review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://mir-jenkins.ubuntu.com/job/usc-autolanding/24/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/88
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1326/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4549
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/usc-autolanding/24/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/88
    FAILURE: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1326/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1327/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4549
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/92/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/92/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) :
review: Abstain
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

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