Merge lp:~albaguirre/mir/tweak-failing-tests-ci-tsan into lp:mir

[Alberto Aguirre]

Tweak failing tests under CI Thread sanitizer builds

Tweak failing tests under CI Thread sanitizer builds

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2737
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~albaguirre/mir/tweak-failing-tests-ci-tsan/+merge/264463/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/4303/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/452
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/452/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3085
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3085/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5890
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21795

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

review: Needs Fixing (continuous-integration)

[lp:~albaguirre/mir/tweak-failing-tests-ci-tsan]

2737. By Daniel van Vugt on 2015-07-13

Unhide wrapped binaries, and use the more common wrapped binary naming
convention of ".bin".

Although this change only affects what developers see in the build tree,
I think it's useful to be able to see the real binaries you just built.
And to be able to type their names more easily. ;).

Approved by Cemil Azizoglu, PS Jenkins bot.

2738. By Daniel van Vugt on 2015-07-13

Improved shared library loading error messages to include the path
that can't be found. Instead of simply "No such file or directory",
you will now see "/the/path/tried/: No such file or directory".
(LP: #1473268)
. Fixes: https://bugs.launchpad.net/bugs/1473268.

Approved by Robert Ancell, Cemil Azizoglu, PS Jenkins bot.

2739. By Alberto Aguirre on 2015-07-13

logger: flush after every newline.

This does not impact tty output performance as it already flushes on every new line. Fixes: https://bugs.launchpad.net/bugs/1470204.

Approved by PS Jenkins bot, Cemil Azizoglu, Daniel van Vugt.

2740. By Daniel van Vugt on 2015-07-13

Bump the server ABI to 33. It seems we've already broken the server
ABI with virtual function table changes introduced in r2730:
  include/server/mir/frontend/session_mediator_report.h.

Approved by Cemil Azizoglu, PS Jenkins bot.

2741. By Kevin DuBois on 2015-07-13

fixes lp: #1471858. Fixes: https://bugs.launchpad.net/bugs/1471858.

Approved by PS Jenkins bot, Cemil Azizoglu, Daniel van Vugt.

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2737
http://jenkins.qa.ubuntu.com/job/mir-ci/4309/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/458
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/458/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3096
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3096/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5901
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21819

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2738
http://jenkins.qa.ubuntu.com/job/mir-ci/4310/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/672
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/459
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3097
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3097/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5902
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21821

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

Well it passes now:
http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/5/console

Once this MP is merged we can enable the mir-clang-ts-wily-amd64-build job on all MP's CI runs.

[Daniel van Vugt (vanvugt)]

The intermediate diff for the revision made sense but this final overall diff seems unnecessary:

21 - ASSERT_THAT(client_frames, Gt(compose_frames * 0.8f));
22 + ASSERT_THAT(client_frames, Gt(compose_frames * 0.80f));

review: Approve

[lp:~albaguirre/mir/tweak-failing-tests-ci-tsan]

2742. By Cemil Azizoglu on 2015-07-14

Use command line options during platform probe.

Approved by PS Jenkins bot, Chris Halse Rogers, Alexandros Frantzis.

2743. By Alberto Aguirre on 2015-07-14

Tweak failing tests under CI Thread sanitizer builds.

Approved by Daniel van Vugt, PS Jenkins bot, Cemil Azizoglu.

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2015-07-10 08:23:21 +0000
+++ cmake/MirCommon.cmake	2015-07-13 22:36:24 +0000
@@ -67,7 +67,7 @@
     # TSan does not support multi-threaded fork
     # TSan may open fds so "surface_creation_does_not_leak_fds" will not work as written
     # TSan deadlocks when running StreamTransportTest/0.SendsFullMessagesWhenInterrupted - disable it until understood
-    set(test_exclusion_filter "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted")
+    set(test_exclusion_filter "UnresponsiveClient.does_not_hang_server:DemoInProcessServerWithStubClientPlatform.surface_creation_does_not_leak_fds:StreamTransportTest/0.SendsFullMessagesWhenInterrupted:BufferQueue/WithTwoOrMoreBuffers.client_framerate_matches_compositor*:BufferQueue/WithThreeOrMoreBuffers.slow_client_framerate_matches_compositor*:BufferQueue/WithThreeOrMoreBuffers.queue_size_scales_with_client_performance*")
   endif()
 
   # Final commands

=== modified file 'tests/unit-tests/compositor/test_buffer_queue.cpp'
--- tests/unit-tests/compositor/test_buffer_queue.cpp	2015-07-02 18:01:28 +0000
+++ tests/unit-tests/compositor/test_buffer_queue.cpp	2015-07-13 22:36:24 +0000
@@ -921,7 +921,7 @@
     monitor1.stop();
 
     // Roughly compose_frames == client_frames within 20%
-    ASSERT_THAT(client_frames, Gt(compose_frames * 0.8f));
+    ASSERT_THAT(client_frames, Gt(compose_frames * 0.80f));
     ASSERT_THAT(client_frames, Lt(compose_frames * 1.2f));
 }
 

=== modified file 'tests/unit-tests/graphics/mesa/kms/test_display.cpp'
--- tests/unit-tests/graphics/mesa/kms/test_display.cpp	2015-06-29 03:29:31 +0000
+++ tests/unit-tests/graphics/mesa/kms/test_display.cpp	2015-07-13 22:36:24 +0000
@@ -43,6 +43,8 @@
 
 #include "mir_test_framework/udev_environment.h"
 #include "mir/test/fake_shared.h"
+#include "mir/test/auto_unblock_thread.h"
+#include "mir/test/signal.h"
 
 #include <gtest/gtest.h>
 #include <memory>
@@ -59,6 +61,7 @@
 namespace mtd=mir::test::doubles;
 namespace mtf=mir_test_framework;
 namespace mr=mir::report;
+namespace mt=mir::test;
 
 namespace
 {
@@ -727,53 +730,44 @@
     auto display = create_display(create_platform());
 
     mir::GLibMainLoop ml{std::make_shared<mir::time::SteadyClock>()};
-    std::condition_variable done;
+    mir::test::Signal done;
 
     int const device_add_count{1};
     int const device_change_count{10};
     int const expected_call_count{device_add_count + device_change_count};
-    int call_count{0};
-    std::mutex m;
+    std::atomic<int> call_count{0};
 
     display->register_configuration_change_handler(
         ml,
-        [&call_count, &ml, &done, &m]()
+        [&call_count, &ml, &done]()
         {
-            std::unique_lock<std::mutex> lock(m);
             if (++call_count == expected_call_count)
             {
-                ml.stop();
-                done.notify_all();
+                done.raise();
             }
         });
 
-    std::thread t{
-        [this]
-        {
-            auto const syspath = fake_devices.add_device("drm", "card2", NULL, {}, {"DEVTYPE", "drm_minor"});
-
-            for (int i = 0; i != device_change_count; ++i)
-            {
-                // sleeping between calls to fake_devices hides race conditions
-                std::this_thread::sleep_for(std::chrono::microseconds{500});
-                fake_devices.emit_device_changed(syspath);
-            }
-        }};
-
-    std::thread watchdog{
-        [this, &done, &m, &ml, &call_count]
-        {
-            std::unique_lock<std::mutex> lock(m);
-            if (!done.wait_for(lock, std::chrono::seconds{1}, [&call_count]() { return call_count == expected_call_count; }))
-                ml.stop();
-        }
-    };
-
-    ml.run();
-
-    t.join();
-    watchdog.join();
-
+    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});
+
+    mt::AutoUnblockThread mainLoopThread([&ml]{ml.stop();}, [&ml]{ml.run();});
+    ASSERT_TRUE(mainloop_started->wait_for(std::chrono::milliseconds{100}));
+
+    auto const syspath = fake_devices.add_device("drm", "card2", NULL, {}, {"DEVTYPE", "drm_minor"});
+
+    for (int i = 0; i != device_change_count; ++i)
+    {
+        // sleeping between calls to fake_devices hides race conditions
+        std::this_thread::sleep_for(std::chrono::microseconds{500});
+        fake_devices.emit_device_changed(syspath);
+    }
+
+    done.wait_for(std::chrono::seconds{10});
     EXPECT_EQ(expected_call_count, call_count);
 }
 

=== modified file 'tests/unit-tests/test_glib_main_loop.cpp'
--- tests/unit-tests/test_glib_main_loop.cpp	2015-06-25 03:00:08 +0000
+++ tests/unit-tests/test_glib_main_loop.cpp	2015-07-13 22:36:24 +0000
@@ -121,7 +121,7 @@
 
     ml.stop();
 
-    EXPECT_TRUE(loop_finished.wait_for(std::chrono::seconds{10}));
+    EXPECT_TRUE(loop_finished.wait_for(std::chrono::seconds{20}));
 }
 
 TEST_F(GLibMainLoopTest, ignores_handler_added_after_stop)
@@ -1107,7 +1107,7 @@
         auto alarm = ml.create_alarm([&]{ notification_called.raise(); });
         alarm->reschedule_in(std::chrono::milliseconds{0});
 
-        EXPECT_TRUE(notification_called.wait_for(std::chrono::seconds{5}));
+        EXPECT_TRUE(notification_called.wait_for(std::chrono::seconds{15}));
     }
 }