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
=== 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 @@
26)26)
2727
28function(add_valgrind_test NAME EXECUTABLE)28function(add_valgrind_test NAME EXECUTABLE)
29 if(ENABLE_MEMCHECK_OPTION)29 if(ENABLE_MEMCHECK_OPTION AND VALGRIND_PROGRAM)
30 add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")30 add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
31 else()31 else()
32 add_test(${NAME} ${EXECUTABLE})32 add_test(${NAME} ${EXECUTABLE})
3333
=== 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 @@
11 pkg-config,11 pkg-config,
12 python3-dbusmock,12 python3-dbusmock,
13 qtbase5-dev,13 qtbase5-dev,
14 valgrind,14 valgrind [!arm64 !ppc64el],
15Standards-Version: 3.9.415Standards-Version: 3.9.4
16Homepage: https://launchpad.net/libqtdbustest16Homepage: https://launchpad.net/libqtdbustest
17# If you aren't a member of ~unity-team but need to upload packaging changes,17# If you aren't a member of ~unity-team but need to upload packaging changes,
1818
=== 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 @@
25 ...25 ...
26 fun:g_main_context_new26 fun:g_main_context_new
27}27}
28
29{
30 False positive leak on strings in i386
31 Memcheck:Leak
32 fun:_Znwj
33 fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
34 ...
35 fun:_ZN7testing14InitGoogleTestEPiPPc
36 fun:(below main)
37}
38
39{
40 False positive leak on strings on i386
41 Memcheck:Leak
42 fun:_Znwj
43 fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
44 ...
45 fun:__libc_csu_init
46 fun:(below main)
47}
48
49{
50 Qt apparently has some statically allocated data here
51 Memcheck:Leak
52 fun:calloc
53 fun:allocate_dtv
54 fun:_ZN7QThread5startENS_8PriorityE
55 obj:/usr/lib/*/libQt5Core.so.*
56 ...
57 obj:*
58}

Subscribers

People subscribed via source and target branches

to all changes: