Skip to content

Commit 03dde5f

Browse files
author
Łukasz 'sil2100' Zemczak
committed
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.
1 parent 41e09a8 commit 03dde5f

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

debian/control

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Build-Depends: cmake,
1515
qtbase5-dev,
1616
sphinx-voxforge-hmm-en,
1717
sphinx-voxforge-lm-en,
18-
valgrind [!arm64 !ppc64el],
1918
Standards-Version: 3.9.4
2019
Homepage: https://launchpad.net/unity-voice
2120
# if you don't have have commit access to this branch but would like to upload

debian/rules

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@
33

44
export DPKG_GENSYMBOLS_CHECK_LEVEL=4
55

6-
ifeq ($(DEB_HOST_ARCH),armhf)
7-
ENABLE_MEMCHECK_OPTION = OFF
8-
else
9-
ENABLE_MEMCHECK_OPTION = ON
10-
endif
11-
126
%:
137
dh $@ --parallel --fail-missing
148

159
override_dh_auto_configure:
16-
dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
10+
# In case valgrind is installed - disable the memcheck option
11+
dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=OFF
1712

1813
override_dh_makeshlibs:
1914
dh_makeshlibs -V

0 commit comments

Comments
 (0)