Merge lp:~albaguirre/mir/yet-more-tsan-ci-tweaks into lp:mir

[Alberto Aguirre]

More tweaks to fix intermittent test failures in the TSan CI build job

More test tweaks to fix intermittent test failures in the TSan CI build job

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2753
http://jenkins.qa.ubuntu.com/job/mir-ci/4334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3184
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/483
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3132
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5937
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21914

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

41 - ASSERT_TRUE(mainloop_started->wait_for(std::chrono::milliseconds{100}));
42 + ASSERT_TRUE(mainloop_started.wait_for(10s));

Quite an increase.

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'src/include/server/mir/display_server.h'
--- src/include/server/mir/display_server.h	2015-02-22 07:46:25 +0000
+++ src/include/server/mir/display_server.h	2015-07-16 15:40:26 +0000
@@ -40,7 +40,7 @@
 
 private:
     struct Private;
-    std::unique_ptr<Private> p;
+    std::unique_ptr<Private> const p;
 
     DisplayServer() = delete;
     DisplayServer(const DisplayServer&) = delete;

=== modified file 'tests/unit-tests/graphics/mesa/kms/test_display.cpp'
--- tests/unit-tests/graphics/mesa/kms/test_display.cpp	2015-07-10 22:38:49 +0000
+++ tests/unit-tests/graphics/mesa/kms/test_display.cpp	2015-07-16 15:40:26 +0000
@@ -726,6 +726,7 @@
 TEST_F(MesaDisplayTest, drm_device_change_event_triggers_handler)
 {
     using namespace testing;
+    using namespace std::chrono_literals;
 
     auto display = create_display(create_platform());
 
@@ -747,16 +748,13 @@
             }
         });
 
-    auto mainloop_started = std::make_shared<mt::Signal>();
 
-    auto fire_on_mainloop_start = ml.create_alarm([mainloop_started]()
-    {
-        mainloop_started->raise();
-    });
-    fire_on_mainloop_start->reschedule_in(std::chrono::milliseconds{0});
+    int const owner{0};
+    mt::Signal mainloop_started;
+    ml.enqueue(&owner, [&] { mainloop_started.raise(); });
 
     mt::AutoUnblockThread mainLoopThread([&ml]{ml.stop();}, [&ml]{ml.run();});
-    ASSERT_TRUE(mainloop_started->wait_for(std::chrono::milliseconds{100}));
+    ASSERT_TRUE(mainloop_started.wait_for(10s));
 
     auto const syspath = fake_devices.add_device("drm", "card2", NULL, {}, {"DEVTYPE", "drm_minor"});
 
@@ -767,7 +765,7 @@
         fake_devices.emit_device_changed(syspath);
     }
 
-    done.wait_for(std::chrono::seconds{10});
+    done.wait_for(20s);
     EXPECT_EQ(expected_call_count, call_count);
 }
 

=== modified file 'tools/tsan-suppressions'
--- tools/tsan-suppressions	2015-03-31 02:35:42 +0000
+++ tools/tsan-suppressions	2015-07-16 15:40:26 +0000
@@ -3,3 +3,5 @@
 race:testing::internal::FunctionMockerBase
 race:~posix_event
 race:boost::asio::detail::posix_event::signal_and_unlock
+#Suppress false positive when deleting main loop shared_ptr
+race:std::__shared_ptr<mir::MainLoop, (__gnu_cxx::_Lock_policy)2>::operator->()