MirAL

Merge lp://qastaging/~alan-griffiths/miral/fix-FTBFS-on-Xenial-with-Mir-0.27 into lp://qastaging/miral

  1. fix-FTBFS-on-Xenial-with-Mir-0.27
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: 574
Merged at revision: 572
Proposed branch: lp://qastaging/~alan-griffiths/miral/fix-FTBFS-on-Xenial-with-Mir-0.27
Merge into: lp://qastaging/miral
Diff against target: 86 lines (+12/-12)
1 file modified
test/drag_and_drop.cpp (+12/-12)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/miral/fix-FTBFS-on-Xenial-with-Mir-0.27
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+328309@code.qastaging.launchpad.net

Commit message

Fix FTBFS with GMock 1.7 matchers (when compiling against Mir 0.27)

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:574
https://mir-jenkins.ubuntu.com/job/miral-ci/59/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/92
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5016
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5005
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5005
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5005
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/96/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Compiles ok!

Nitpicking: EXPECT_THAT(cookie, Ne(nullptr)) could be EXPECT_NE(nullptr, cookie);
(Google also seems to want the expected value to be first)

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

> Compiles ok!
>
> Nitpicking: EXPECT_THAT(cookie, Ne(nullptr)) could be EXPECT_NE(nullptr,
> cookie);
> (Google also seems to want the expected value to be first)

I think "EXPECT_THAT(cookie, Ne(nullptr))" reads better than "EXPECT_NE(nullptr, cookie)"

Revision history for this message
Gerry Boland (gerboland) wrote :

Not worth arguing about :)

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