Mir

Merge lp://qastaging/~alan-griffiths/mir/revert-3477 into lp://qastaging/mir

  1. revert-3477
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Rejected
Rejected by: Alan Griffiths
Proposed branch: lp://qastaging/~alan-griffiths/mir/revert-3477
Merge into: lp://qastaging/mir
Diff against target: 97 lines (+16/-52)
3 files modified
debian/mir-test-tools.install (+0/-1)
tests/performance-tests/CMakeLists.txt (+16/-9)
tests/performance-tests/performance_tests.sh (+0/-42)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/revert-3477
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Daniel van Vugt Disapprove
Review via email: mp+293063@code.qastaging.launchpad.net

Commit message

Revert change that overwrites the "wrapper" executable (linked by various targets) with a script

Description of the change

Revert change that overwrites the "wrapper" executable (linked by various targets) with a script

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

We found it's just the result of an unclean build tree (incremental builds).

Simple to fix.

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

Try this:
https://code.launchpad.net/~vanvugt/mir/cp-dont-follow-symlinks/+merge/293064

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

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

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

review: Approve (continuous-integration)

Unmerged revisions

3481. By Alan Griffiths

Revert -C 3477

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