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

Proposed by Pete Woods on 2014-01-02
Status: Merged
Approved by: Pete Woods on 2014-01-02
Approved revision: 31
Merged at revision: 30
Proposed branch: lp:~pete-woods/libqtdbusmock/valgrind-present-1263925
Merge into: lp:libqtdbusmock
Diff against target: 64 lines (+33/-2)
3 files modified
cmake/FindValgrind.cmake (+1/-1)
debian/control (+1/-1)
tests/data/valgrind.suppression (+31/-0)
To merge this branch: bzr merge lp:~pete-woods/libqtdbusmock/valgrind-present-1263925
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve on 2014-01-02
PS Jenkins bot (community) continuous-integration Approve on 2014-01-02
Unity Team 2014-01-02 Pending
Review via email: mp+200297@code.launchpad.net

Commit message

Valgrind is not present on all architectures

Description of the change

Valgrind is not present on all architectures

To post a comment you must log in.
31. By Pete Woods on 2014-01-02

Add suppressions for false positives on i386

Marcus Tomlinson (marcustomlinson) wrote :

CI is happy, I'm happy :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/FindValgrind.cmake'
2--- cmake/FindValgrind.cmake 2013-08-01 15:17:32 +0000
3+++ cmake/FindValgrind.cmake 2014-01-02 13:10:09 +0000
4@@ -26,7 +26,7 @@
5 )
6
7 function(add_valgrind_test NAME EXECUTABLE)
8- if(ENABLE_MEMCHECK_OPTION)
9+ if(ENABLE_MEMCHECK_OPTION AND VALGRIND_PROGRAM)
10 add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
11 else()
12 add_test(${NAME} ${EXECUTABLE})
13
14=== modified file 'debian/control'
15--- debian/control 2013-08-07 18:05:43 +0000
16+++ debian/control 2014-01-02 13:10:09 +0000
17@@ -11,7 +11,7 @@
18 pkg-config,
19 python3-dbusmock,
20 qtbase5-dev,
21- valgrind,
22+ valgrind [!arm64 !ppc64el],
23 Standards-Version: 3.9.4
24 Homepage: https://launchpad.net/libqtdbustest
25 # If you aren't a member of ~unity-team but need to upload packaging changes,
26
27=== modified file 'tests/data/valgrind.suppression'
28--- tests/data/valgrind.suppression 2013-08-07 11:02:23 +0000
29+++ tests/data/valgrind.suppression 2014-01-02 13:10:09 +0000
30@@ -25,3 +25,34 @@
31 ...
32 fun:g_main_context_new
33 }
34+
35+{
36+ False positive leak on strings in i386
37+ Memcheck:Leak
38+ fun:_Znwj
39+ fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
40+ ...
41+ fun:_ZN7testing14InitGoogleTestEPiPPc
42+ fun:(below main)
43+}
44+
45+{
46+ False positive leak on strings on i386
47+ Memcheck:Leak
48+ fun:_Znwj
49+ fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
50+ ...
51+ fun:__libc_csu_init
52+ fun:(below main)
53+}
54+
55+{
56+ Qt apparently has some statically allocated data here
57+ Memcheck:Leak
58+ fun:calloc
59+ fun:allocate_dtv
60+ fun:_ZN7QThread5startENS_8PriorityE
61+ obj:/usr/lib/*/libQt5Core.so.*
62+ ...
63+ obj:*
64+}

Subscribers

People subscribed via source and target branches

to all changes: