Merge lp:~pete-woods/unity-voice/valgrind-not-on-all-platforms into lp:unity-voice

[Pete Woods]

Valgrind is not available on all platforms

Valgrind is not available on all platforms

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/unity-voice-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-voice-trusty-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-voice-ci/4/rebuild

review: Approve (continuous-integration)

=== modified file 'cmake/FindValgrind.cmake'
--- cmake/FindValgrind.cmake	2013-08-22 21:04:44 +0000
+++ cmake/FindValgrind.cmake	2014-01-03 12:08:26 +0000
@@ -26,7 +26,7 @@
 )
 
 function(add_valgrind_test NAME EXECUTABLE)
-	if(ENABLE_MEMCHECK_OPTION)
+	if(ENABLE_MEMCHECK_OPTION AND VALGRIND_PROGRAM)
 		add_test(${NAME} ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS} "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}")
 	else()
 		add_test(${NAME} ${EXECUTABLE})

=== modified file 'debian/control'
--- debian/control	2013-11-28 16:10:19 +0000
+++ debian/control	2014-01-03 12:08:26 +0000
@@ -15,7 +15,7 @@
                qtbase5-dev,
                sphinx-voxforge-hmm-en,
                sphinx-voxforge-lm-en,
-               valgrind,
+               valgrind [!arm64 !ppc64el],
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/unity-voice
 # if you don't have have commit access to this branch but would like to upload