Merge lp:~pete-woods/libqtdbusmock/valgrind-present-1263925 into lp:libqtdbusmock

[Pete Woods]

Valgrind is not present on all architectures

Valgrind is not present on all architectures

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/libqtdbusmock-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbusmock-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbusmock-trusty-armhf-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/libqtdbusmock-trusty-i386-ci/1/console

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

review: Needs Fixing (continuous-integration)

[lp:~pete-woods/libqtdbusmock/valgrind-present-1263925]

31. By Pete Woods on 2014-01-02

Add suppressions for false positives on i386

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/libqtdbusmock-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbusmock-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbusmock-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbusmock-trusty-i386-ci/2

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

CI is happy, I'm happy :)

review: Approve

=== modified file 'cmake/FindValgrind.cmake'
--- cmake/FindValgrind.cmake	2013-08-01 15:17:32 +0000
+++ cmake/FindValgrind.cmake	2014-01-02 13:10:09 +0000
@@ -26,7 +26,7 @@
 )
 
 function(add_valgrind_test NAME EXECUTABLE)
-	if(ENABLE_MEMCHECK_OPTION)
+	if(ENABLE_MEMCHECK_OPTION AND VALGRIND_PROGRAM)
 		add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
 	else()
 		add_test(${NAME} ${EXECUTABLE})

=== modified file 'debian/control'
--- debian/control	2013-08-07 18:05:43 +0000
+++ debian/control	2014-01-02 13:10:09 +0000
@@ -11,7 +11,7 @@
                pkg-config,
                python3-dbusmock,
                qtbase5-dev,
-               valgrind,
+               valgrind [!arm64 !ppc64el],
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/libqtdbustest
 # If you aren't a member of ~unity-team but need to upload packaging changes,

=== modified file 'tests/data/valgrind.suppression'
--- tests/data/valgrind.suppression	2013-08-07 11:02:23 +0000
+++ tests/data/valgrind.suppression	2014-01-02 13:10:09 +0000
@@ -25,3 +25,34 @@
    ...
    fun:g_main_context_new
 }
+
+{
+   False positive leak on strings in i386
+   Memcheck:Leak
+   fun:_Znwj
+   fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
+   ...
+   fun:_ZN7testing14InitGoogleTestEPiPPc
+   fun:(below main)
+}
+
+{
+   False positive leak on strings on i386
+   Memcheck:Leak
+   fun:_Znwj
+   fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
+   ...
+   fun:__libc_csu_init
+   fun:(below main)
+}
+
+{
+   Qt apparently has some statically allocated data here
+   Memcheck:Leak
+   fun:calloc
+   fun:allocate_dtv
+   fun:_ZN7QThread5startENS_8PriorityE
+   obj:/usr/lib/*/libQt5Core.so.*
+   ...
+   obj:*
+}