Mir

Merge lp:~alan-griffiths/mir/fix-miral-test-failure-on-xenial into lp:mir

Proposed by Alan Griffiths on 2017-08-01
Status: Merged
Approved by: Alan Griffiths on 2017-08-01
Approved revision: 4218
Merged at revision: 4217
Proposed branch: lp:~alan-griffiths/mir/fix-miral-test-failure-on-xenial
Merge into: lp:mir
Diff against target: 11 lines (+1/-1)
1 file modified
tests/mirtest.pc.in (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-miral-test-failure-on-xenial
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-08-01
Mir development team 2017-08-01 Pending
Review via email: mp+328366@code.launchpad.net

Commit message

[mirtest] Remove spurious link library

Description of the change

[mirtest] Remove spurious link library

As a result of the vagaries of loading and unloading protobuf & protobuf-lite this causes miral-test to segfault during exit when built against lp:mir on Xenial.

To post a comment you must log in.
4218. By Alan Griffiths on 2017-08-01

[mirtest] Restore corrected link library

Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4217
https://mir-jenkins.ubuntu.com/job/mir-ci/3521/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4818
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5019
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5008
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5008
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5008
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4855/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4855/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4855/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4855/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4855/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4855/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4855/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4855
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4855/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mirtest.pc.in'
2--- tests/mirtest.pc.in 2017-05-17 04:48:46 +0000
3+++ tests/mirtest.pc.in 2017-08-01 15:25:00 +0000
4@@ -5,6 +5,6 @@
5 Name: mirtest
6 Description: Mir test assist library
7 Version: @MIR_VERSION@
8-Requires: mirserver mirplatform mirclient mir-renderer-gl-dev protobuf
9+Requires: mirserver mirplatform mirclient mir-renderer-gl-dev protobuf-lite
10 Libs: -L@LIBDIR@ -lmir-test-assist -ldl -lboost_filesystem -lboost_system
11 Cflags: -I@INCLUDEDIR@

Subscribers

People subscribed via source and target branches