Mir

Merge lp:~alan-griffiths/mir/fix-mirtest.pc into lp:mir

  1. fix-mirtest.pc
  2. Merge into development-branch
Proposed by Alan Griffiths on 2017-05-16
Status: Merged
Approved by: Alan Griffiths on 2017-05-16
Approved revision: 4167
Merged at revision: 4168
Proposed branch: lp:~alan-griffiths/mir/fix-mirtest.pc
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-mirtest.pc
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-05-16
Andreas Pokorny (community) Approve on 2017-05-16
Mir development team 2017-05-16 Pending
Review via email: mp+324097@code.launchpad.net

Commit Message

Add protobuf dependency to mirtest (for display_config_matchers.cpp)

To post a comment you must log in.
Andreas Pokorny (andreas-pokorny) wrote :

Yes that was missing. I think we also lack libmirprotobuf - but that might be missing in a different package. (I currently think it needs to go into libmirplatform)

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

PASSED: Continuous integration, rev:4167
https://mir-jenkins.ubuntu.com/job/mir-ci/3398/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4619
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4748
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4737
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4737
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4651/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4651/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4651/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/4651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4651/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4651/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3398/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-04-28 03:49:54 +0000
3+++ tests/mirtest.pc.in 2017-05-16 10:35:24 +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
9+Requires: mirserver mirplatform mirclient mir-renderer-gl-dev protobuf
10 Libs: -L@LIBDIR@ -lmir-test-assist -ldl -lboost_filesystem -lboost_system
11 Cflags: -I@INCLUDEDIR@

Subscribers

People subscribed via source and target branches