[colobot] 02/03: Allow tests to fail on architectures without support in hippomocks, circumvent the FTBFS

Didier Raboud odyx at moszumanska.debian.org
Tue Nov 8 21:22:58 UTC 2016


This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit a9f582d855332714e51e6f189a9e49960bb4eafb
Author: Didier Raboud <odyx at debian.org>
Date:   Tue Nov 8 20:36:33 2016 +0100

    Allow tests to fail on architectures without support in hippomocks, circumvent the FTBFS
---
 debian/rules | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/rules b/debian/rules
index b2ab4af..e930aea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+HIPPOMOCKS_BROKEN_ARCHS=arm64 mips mips64el mipsel
+DEB_HOST_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 CBOT_CONFIGURE_SOUNDS=-DMUSIC:BOOL=False
 ifneq (,$(findstring colobot-common-sounds, $(shell dh_listpackages)))
 CBOT_CONFIGURE_SOUNDS=-DMUSIC:BOOL=True -DMUSIC_FLAC:BOOL=True
@@ -26,6 +29,12 @@ override_dh_auto_build-arch:
 override_dh_auto_build-indep:
 	dh_auto_build -i -- doc
 
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(HIPPOMOCKS_BROKEN_ARCHS)))
+override_dh_auto_test-arch:
+	# Allow the tests to fail on that architecture, see #843690
+	- dh_auto_test -a
+endif
+
 override_dh_auto_test-indep:
 
 override_dh_auto_clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git



More information about the Pkg-games-commits mailing list