Ubuntu Application Launcher

Merge lp://staging/~ted/ubuntu-app-launch/mir-26 into lp://staging/ubuntu-app-launch

  1. mir-26
  2. Merge into trunk.17.04
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 283
Merged at revision: 284
Proposed branch: lp://staging/~ted/ubuntu-app-launch/mir-26
Merge into: lp://staging/ubuntu-app-launch
Diff against target: 141 lines (+23/-28)
4 files modified
libubuntu-app-launch/ubuntu-app-launch.cpp (+10/-9)
tests/mir-mock.cpp (+3/-13)
ubuntu-app-test/src/CMakeLists.txt (+1/-1)
ubuntu-app-test/src/ubuntu-app-test.cpp (+9/-5)
To merge this branch: bzr merge lp://staging/~ted/ubuntu-app-launch/mir-26
Reviewer Review Type Date Requested Status
Alan Griffiths Needs Fixing
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+316173@code.staging.launchpad.net

Commit message

Handle deprecated functions in Mir 0.26

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:281
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/198/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1585/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1592
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1370/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1370/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1370/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1370/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1370/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1370/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/198/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ted/ubuntu-app-launch/mir-26 updated
282. By Ted Gould

Remove mir_wait_for() in ubuntu-app-test as well

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:282
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/199/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1587/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1594
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1372/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1372/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1372/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1372/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1372/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1372/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/199/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~ted/ubuntu-app-launch/mir-26 updated
283. By Ted Gould

Remove mir_client_fd_callback and mir_wait_for() from the mir mock

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:283
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/200/
Executed test runs:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/200/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Looks reasonable. (I'd probably have used pthread_cond_t in a C program.)

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

Actually, Mir 0.26.1 will be along real soon with a _sync version of this API.

As a temporary measure until that becomes available I recommend disabling the deprecated diagnostic around the call site.

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

Mir 0.26.1 is in ticket #2435

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