Merge lp:~bregma/mir/lp-1504579 into lp:mir

[Stephen M. Webb]

Suppress some futex-related valgrind errors coming from libstdc++-v3 code on Linux (LP: #1504579)

Suppress some valgrind errors coming from libstdc++-v3 when doing Linux futex waits. These errors are causing CI failures on Wily.

[Alan Griffiths (alan-griffiths)]

*Tentative Approval* pending CI results

Looks plausible. So long as CI passes on the 32bit targets I approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3012
http://jenkins.qa.ubuntu.com/job/mir-ci/5226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4331
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/289/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1380
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/289
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4332
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4332/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/6983
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24121
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/290/console

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

[Daniel van Vugt (vanvugt)]

Sure.

review: Approve

=== modified file 'tools/valgrind_suppressions_generic'
--- tools/valgrind_suppressions_generic	2015-04-28 07:54:10 +0000
+++ tools/valgrind_suppressions_generic	2015-10-09 16:44:28 +0000
@@ -12,3 +12,21 @@
    fun:ioctl
    fun:_ZN7android8EventHub16openDeviceLockedEPKc
 }
+{
+   <kernel_ignores_futex_utime_if_not_required>
+   Memcheck:Param
+   futex(utime)
+   fun:syscall
+   fun:_ZNSt28__atomic_futex_unsigned_base19_M_futex_wait_until*
+   ...
+   fun:_M_load_and_test
+}
+{
+   <kernel_ignores_futex_timeouts_if_not_required>
+   Memcheck:Param
+   futex(timeout)
+   fun:syscall
+   fun:_ZNSt28__atomic_futex_unsigned_base19_M_futex_wait_until*
+   ...
+   fun:_M_load_and_test
+}