Merge lp:~afrantzis/mir/fix-mock-drmgetbusid-race into lp:~mir-team/mir/trunk

[Alexandros Frantzis]

tests: Fix race condition in MockDRM leading to memory errors

Previously, because we allocated and returned memory in two step, using
a unique storage point to hold the allocated memory, there was the
potential for memory errors (e.g. double frees) in multithreaded tests
(like drm_close_not_called_concurrently_on_ipc_package_destruction).

tests: Fix race condition in MockDRM leading to memory errors

Previously, because we allocated and returned memory in two step, using
a unique storage point to hold the allocated memory, there was the
potential for memory errors (e.g. double frees) in multithreaded tests
(like drm_close_not_called_concurrently_on_ipc_package_destruction).

[Alan Griffiths (alan-griffiths)]

It isn't obvious why, but this appears to fix https://bugs.launchpad.net/mir/+bug/1197408

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:807
http://jenkins.qa.ubuntu.com/job/mir-ci/903/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1040
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/548

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

review: Approve (continuous-integration)

=== modified file 'include/test/mir_test_doubles/mock_drm.h'
--- include/test/mir_test_doubles/mock_drm.h	2013-06-25 06:27:05 +0000
+++ include/test/mir_test_doubles/mock_drm.h	2013-07-04 07:58:28 +0000
@@ -128,7 +128,6 @@
     MOCK_METHOD1(drmGetBusid, char* (int fd));
 
     FakeDRMResources fake_drm;
-    char* busid;
 };
 
 }

=== modified file 'tests/mir_test_doubles/mock_drm.cpp'
--- tests/mir_test_doubles/mock_drm.cpp	2013-06-26 07:30:18 +0000
+++ tests/mir_test_doubles/mock_drm.cpp	2013-07-04 07:58:28 +0000
@@ -241,8 +241,7 @@
     .WillByDefault(Return(0));
 
     ON_CALL(*this, drmGetBusid(_))
-    .WillByDefault(DoAll(InvokeWithoutArgs([this]() {this->busid = static_cast<char*>(malloc(10));}),
-                         ReturnPointee(&this->busid)));
+    .WillByDefault(WithoutArgs(Invoke([]{ return static_cast<char*>(malloc(10)); })));
 }
 
 mgg::MockDRM::~MockDRM() noexcept