The following commit has been merged in the master branch: commit 58c6eefb4e4dd1d28008f60a3df5b8d15391bb46 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Nov 13 20:19:19 2013 +0100
Disable tests only on architectures where they fail. diff --git a/debian/changelog b/debian/changelog index 008d905..82a0df1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spatialite (4.1.1-3) UNRELEASED; urgency=low + + * Disable tests only on architectures where they fail. + + -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 14 Nov 2013 15:10:23 +0100 + spatialite (4.1.1-2) experimental; urgency=low * Disable hexgrid22.testcase, fails on 32bit archs. diff --git a/debian/rules b/debian/rules index 8ea52c5..ddd6094 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,10 @@ LC_VERSION := $(shell echo $(VERSION) | tr A-Z a-z) SPATIALITE_VERSION := $(shell echo $(FULL_VERSION) | sed -e 's/~.*//') BASE_URL := http://www.gaia-gis.it/gaia-sins + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_BUILD_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS) + # see FTBFS #649302 ifeq ($(DEB_HOST_ARCH),powerpc) EPSG := --disable-epsg @@ -21,6 +24,20 @@ else EPSG := endif +# Several testcases fail on armel, armhf, mips & mipsel due to a rounding mismatch. #725267 +DISABLE_ROUNDING_ARCHS=armel armhf mips mipsel + +DISABLE_ROUNDING=no +ifneq (,$(findstring $(DEB_HOST_ARCH), $(DISABLE_ROUNDING_ARCHS))) +DISABLE_ROUNDING=yes +endif + +# 32bit arch specific test failure +DISABLE_32BIT=no +ifeq ($(DEB_BUILD_ARCH_BITS),32) +DISABLE_32BIT=yes +endif + %: dh $@ --with autoreconf @@ -39,15 +56,21 @@ override_dh_auto_test: mkdir -p debian/backup/stmt cp test/*.sqlite debian/backup/ cp test/sql_stmt_tests/*.sqlite debian/backup/stmt/ - # Disable fromgeojson22.testcase: fails on armel, armhf, mips & mipsel. +ifeq ($(DISABLE_ROUNDING),yes) mv test/sql_stmt_tests/fromgeojson22.testcase test/sql_stmt_tests/fromgeojson22.disabled - # Disable hexgrid22.testcase: fails on 32bit archs +endif +ifeq ($(DISABLE_32BIT),yes) mv test/sql_stmt_geosadvanced_tests/hexgrid22.testcase test/sql_stmt_geosadvanced_tests/hexgrid22.disabled +endif dh_auto_test +ifeq ($(DISABLE_32BIT),yes) mv test/sql_stmt_geosadvanced_tests/hexgrid22.disabled test/sql_stmt_geosadvanced_tests/hexgrid22.testcase +endif +ifeq ($(DISABLE_ROUNDING),yes) mv test/sql_stmt_tests/fromgeojson22.disabled test/sql_stmt_tests/fromgeojson22.testcase +endif cp debian/backup/stmt/*.sqlite test/sql_stmt_tests/ cp debian/backup/*.sqlite test/ rm -rf debian/backup -- geospatial extension for SQLite _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel