libusermetrics

Merge lp:~pete-woods/libusermetrics/gcc5-valgrind-fail-lp1475600 into lp:libusermetrics

  1. gcc5-valgrind-fail-lp1475600
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 202
Merged at revision: 202
Proposed branch: lp:~pete-woods/libusermetrics/gcc5-valgrind-fail-lp1475600
Merge into: lp:libusermetrics
Prerequisite: lp:~pete-woods/libusermetrics/ftbfs-qt5.5-lp1447173
Diff against target: 22 lines (+1/-9)
1 file modified
debian/rules (+1/-9)
To merge this branch: bzr merge lp:~pete-woods/libusermetrics/gcc5-valgrind-fail-lp1475600
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+265631@code.launchpad.net

Commit message

Disable valgrind during debian builds

Description of the change

Disable valgrind during debian builds

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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-05-09 20:44:13 +0000
3+++ debian/rules 2015-07-23 08:17:35 +0000
4@@ -5,17 +5,9 @@
5
6 include /usr/share/dpkg/default.mk
7
8-ifneq (,$(filter $(DEB_HOST_ARCH),armhf ppc64el powerpc arm64))
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 -- -DBUILD_DOXYGEN=YES -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
19+ dh_auto_configure -- -DBUILD_DOXYGEN=YES
20
21-override_dh_makeshlibs:
22- dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: