Merge lp://staging/~ted/ubuntu-app-launch/signal-instances into lp://staging/ubuntu-app-launch

Proposed by Ted Gould
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 280
Merged at revision: 278
Proposed branch: lp://staging/~ted/ubuntu-app-launch/signal-instances
Merge into: lp://staging/ubuntu-app-launch
Prerequisite: lp://staging/~ted/ubuntu-app-launch/jobs-signals
Diff against target: 732 lines (+149/-86)
21 files modified
application-failed.c (+9/-2)
data/com.canonical.UbuntuAppLaunch.xml (+8/-0)
helpers.c (+2/-2)
helpers.h (+1/-0)
libubuntu-app-launch/application-impl-base.h (+2/-0)
libubuntu-app-launch/application-impl-click.cpp (+5/-0)
libubuntu-app-launch/application-impl-click.h (+2/-0)
libubuntu-app-launch/application-impl-legacy.cpp (+5/-0)
libubuntu-app-launch/application-impl-legacy.h (+2/-0)
libubuntu-app-launch/application-impl-libertine.cpp (+5/-0)
libubuntu-app-launch/application-impl-libertine.h (+2/-0)
libubuntu-app-launch/application-impl-snap.cpp (+5/-0)
libubuntu-app-launch/application-impl-snap.h (+2/-0)
libubuntu-app-launch/jobs-base.cpp (+14/-6)
libubuntu-app-launch/jobs-base.h (+1/-0)
libubuntu-app-launch/jobs-upstart.cpp (+15/-12)
libubuntu-app-launch/second-exec-core.c (+6/-3)
libubuntu-app-launch/second-exec-core.h (+1/-1)
tests/helper-handshake-test.cc (+4/-4)
tests/libual-cpp-test.cc (+31/-29)
tests/libual-test.cc (+27/-27)
To merge this branch: bzr merge lp://staging/~ted/ubuntu-app-launch/signal-instances
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+310588@code.staging.launchpad.net

Commit message

Make the signals support finding the instance of the application

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
277. By Ted Gould

Jobs signals fix

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
278. By Ted Gould

Fix tests

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

FAILED: Continuous integration, rev:278
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/147/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1325/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1332
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1109
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1109/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1109/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1109/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1109
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1109/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1109
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1109/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1109
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1109/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
279. By Ted Gould

Merge updates from the jobs-signal branch

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

FAILED: Continuous integration, rev:279
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/160/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1353/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1360
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1138
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1138/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1138
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1138/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1138
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1138/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1138/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1138
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1138/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1138
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1138/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
280. By Ted Gould

Update to trunk

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

FAILED: Continuous integration, rev:280
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/171/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1453/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1460
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1239/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1239/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1239
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1239/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1239
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1239/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1239/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1239
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1239/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Looks good. I've done a bit of manual testing of UAL in the unity8 desktop session as well, and looks like things are coming together really nicely.

review: Approve

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