Mir

Merge lp:~kdub/mir/fix-1196647 into lp:~mir-team/mir/trunk

Proposed by Kevin DuBois
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 799
Proposed branch: lp:~kdub/mir/fix-1196647
Merge into: lp:~mir-team/mir/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
tests/unit-tests/graphics/android/test_external_refcount.cpp (+1/-1)
To merge this branch: bzr merge lp:~kdub/mir/fix-1196647
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alan Griffiths Approve
Daniel van Vugt Approve
Review via email: mp+172389@code.launchpad.net

Commit message

fix: lp:1196647 (test bug results in crash in android unit tests) bug was just in test code on android

Description of the change

fix: lp:1196647 (test bug results in crash in android unit tests) bug was just in test code on android

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I'm not familiar with this code. But the change is indeed limited to android tests so I trust you're right...

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
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/unit-tests/graphics/android/test_external_refcount.cpp'
2--- tests/unit-tests/graphics/android/test_external_refcount.cpp 2013-06-25 18:06:12 +0000
3+++ tests/unit-tests/graphics/android/test_external_refcount.cpp 2013-07-01 18:30:36 +0000
4@@ -53,7 +53,7 @@
5 mga::MirNativeBuffer* driver_reference = nullptr;
6 {
7 auto tmp = new mga::MirNativeBuffer(native_handle_resource);
8- std::shared_ptr<mga::MirNativeBuffer> buffer(tmp, [](mga::MirNativeBuffer* buffer)
9+ mir_reference = std::shared_ptr<mga::MirNativeBuffer>(tmp, [](mga::MirNativeBuffer* buffer)
10 {
11 buffer->mir_dereference();
12 });

Subscribers

People subscribed via source and target branches