Merge lp:~pete-woods/libqtdbustest/qt-5.2 into lp:libqtdbustest

Proposed by Pete Woods on 2014-03-03
Status: Merged
Merged at revision: 31
Proposed branch: lp:~pete-woods/libqtdbustest/qt-5.2
Merge into: lp:libqtdbustest
Diff against target: 22 lines (+7/-1)
1 file modified
debian/rules (+7/-1)
To merge this branch: bzr merge lp:~pete-woods/libqtdbustest/qt-5.2
Reviewer Review Type Date Requested Status
Timo Jyrinki 2014-03-03 Approve on 2014-03-04
PS Jenkins bot (community) continuous-integration Approve on 2014-03-03
Review via email: mp+209052@code.launchpad.net

Commit message

Valgrind doesn't like dlopens

Description of the change

Valgrind doesn't like dlopens

To post a comment you must log in.
lp:~pete-woods/libqtdbustest/qt-5.2 updated on 2014-03-03
32. By Pete Woods on 2014-03-03

Disable valgrind on ARM

33. By Pete Woods on 2014-03-03

Undo random suppression changes

Timo Jyrinki (timo-jyrinki) wrote :

That seems to help, thank you! I'm adding this MR to the Qt 5.2 landing silo (and http://pad.ubuntu.com/qt52-dependencies)

review: Approve
Timo Jyrinki (timo-jyrinki) wrote :

Tested to be working (https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+packages), scheduled to land together with Qt 5.2.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2014-01-08 18:14:03 +0000
3+++ debian/rules 2014-03-03 12:50:39 +0000
4@@ -3,11 +3,17 @@
5
6 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7
8+ifeq ($(DEB_HOST_ARCH),armhf)
9+ ENABLE_MEMCHECK_OPTION = OFF
10+else
11+ ENABLE_MEMCHECK_OPTION = ON
12+endif
13+
14 %:
15 dh $@ --parallel --fail-missing
16
17 override_dh_auto_configure:
18- dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=YES
19+ dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
20
21 override_dh_makeshlibs:
22 dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: