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

[Pete Woods]

Valgrind doesn't like dlopens

Valgrind doesn't like dlopens

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~pete-woods/libqtdbustest/qt-5.2]

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)]

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/libqtdbustest-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-armhf-ci/8
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-i386-ci/8

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/libqtdbustest-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libqtdbustest-trusty-i386-ci/9

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

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

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

=== modified file 'debian/rules'
--- debian/rules	2014-01-08 18:14:03 +0000
+++ debian/rules	2014-03-03 12:50:39 +0000
@@ -3,11 +3,17 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+ifeq ($(DEB_HOST_ARCH),armhf)
+        ENABLE_MEMCHECK_OPTION = OFF
+else
+        ENABLE_MEMCHECK_OPTION = ON
+endif
+
 %:
 	dh $@ --parallel --fail-missing
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=YES
+	dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V