[geos] 02/03: Skip tests on troublesome architectures.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository geos.

commit 7ff53001c2d775a03a747f9196890aa46ec90ddd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 19 12:27:57 2014 +0100

    Skip tests on troublesome architectures.
---
 debian/changelog |  1 +
 debian/rules     | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 30817f4..be29bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 geos (3.4.2-4) UNRELEASED; urgency=low
 
   * Re-enable parallel builds, wasn't cause of testrunning failures.
+  * Skip tests on troublesome architectures. 
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 19 Mar 2014 12:19:17 +0100
 
diff --git a/debian/rules b/debian/rules
index 360d211..c72c6b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+# testrunner fails on some architectures
+DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 # Guessing geos version, which is required for C++ binding support
 VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.*|cut -d= -f2)
 VER_MINOR=$(shell grep ^VERSION_MINOR configure.*|cut -d= -f2)
@@ -59,6 +62,13 @@ override_dh_auto_build-arch:
 override_dh_auto_build-indep:
 	$(MAKE) -C doc doxygen-html
 
+override_dh_auto_test:
+ifneq (,$(findstring $(DEB_BUILD_ARCH),"s390x powerpc powerpcspe ppc64"))
+	# Skip tests
+else
+	dh_auto_test
+endif
+
 override_dh_install-arch:
 	# add C++ headers to C++ dev package install file
 	cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install

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