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

[Kevin DuBois]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:797
http://jenkins.qa.ubuntu.com/job/mir-ci/870/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/993
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/523

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/870/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/393/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/566
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/47
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/47/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/unit-tests/graphics/android/test_external_refcount.cpp'
--- tests/unit-tests/graphics/android/test_external_refcount.cpp	2013-06-25 18:06:12 +0000
+++ tests/unit-tests/graphics/android/test_external_refcount.cpp	2013-07-01 18:30:36 +0000
@@ -53,7 +53,7 @@
         mga::MirNativeBuffer* driver_reference = nullptr;
         {
             auto tmp = new mga::MirNativeBuffer(native_handle_resource);
-            std::shared_ptr<mga::MirNativeBuffer> buffer(tmp, [](mga::MirNativeBuffer* buffer)
+            mir_reference = std::shared_ptr<mga::MirNativeBuffer>(tmp, [](mga::MirNativeBuffer* buffer)
                 {
                     buffer->mir_dereference();
                 });