Merge lp:~sil2100/unity-voice/fix_ftbfs_on_amd64 into lp:unity-voice

[Łukasz Zemczak]

Disable valgrind memcheck during testing as it's causing a test failure on amd64 (due to valgrind being angry at Qt internals). Remove the valgrind build-dependency.

Disable valgrind memcheck during testing as it's causing a test failure on amd64 (due to valgrind being angry at Qt internals). Remove the valgrind build-dependency.

[lp:~sil2100/unity-voice/fix_ftbfs_on_amd64]

34. By Łukasz Zemczak on 2015-10-05

Change the FindValgrind.cmake bits to have memcheck disabled by default.

[Pete Woods (pete-woods)]

Awesome

review: Approve

=== modified file 'cmake/FindValgrind.cmake'
--- cmake/FindValgrind.cmake	2014-01-03 11:56:18 +0000
+++ cmake/FindValgrind.cmake	2015-10-05 14:39:59 +0000
@@ -2,7 +2,7 @@
 option(
   ENABLE_MEMCHECK_OPTION
   "If set to ON, enables automatic creation of memcheck targets"
-  ON
+  OFF
 )
 
 find_program(

=== modified file 'debian/control'
--- debian/control	2014-01-03 11:56:18 +0000
+++ debian/control	2015-10-05 14:39:59 +0000
@@ -15,7 +15,6 @@
                qtbase5-dev,
                sphinx-voxforge-hmm-en,
                sphinx-voxforge-lm-en,
-               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

=== modified file 'debian/rules'
--- debian/rules	2014-03-03 13:33:24 +0000
+++ debian/rules	2015-10-05 14:39:59 +0000
@@ -3,17 +3,8 @@
 
 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=${ENABLE_MEMCHECK_OPTION}
-
 override_dh_makeshlibs:
 	dh_makeshlibs -V